-all:
+export TMPDIR = $(TMP)/opensrf
+export LD_OPTS = -L $(TMPDIR) -L .
+export CC_OPTS = -g -Wall -O2 -fPIC -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) \
+ -I$(LIBXML2_HEADERS)/libxml -I$(TMP) -I$(TMPDIR)
+
+all: mod_xmltools
-web-install: web-templates-install javascript-install autojs-install
install: perl-install web-install string-templates-install storage-bootstrap xsl-install
+web-install: web-templates-install javascript-install autojs-install mod_xmltools-install webxml-install
+
JSDIR=$(WEBDIR)/js
marcdumper-install:
make -C extras/marcdumper install
+mod_xmltools:
+ make -C apachemods mod_xmltools.so
+
+mod_xmltools-install:
+ make -C apachemods mod_xmltools-install
+
+webxml-install:
+ mkdir -p $(WEBDIR)
+ cp -r webxml $(WEBDIR)
+
perl-install:
@echo "Installing Perl modules to $(PERLDIR)"
mkdir -p $(PERLDIR)
cp -r templates/strings $(TEMPLATEDIR)
-
-
xsl-install:
@echo "Installing XSL files to $(XSLDIR)"
mkdir -p $(XSLDIR)
clean:
@echo "Cleaning..."
make -C extras clean
+
# ---------------------------------------------------------------------------------
-CC_OPTS = -I /usr/include/libxml2 -I /opt/include -g
-APXS2 = /home/erickson/sandbox/apache2/bin/apxs
+#CC_OPTS = -I /usr/include/libxml2 -I /opt/include -g
+#APXS2 = /home/erickson/sandbox/apache2/bin/apxs
# ---------------------------------------------------------------------------------
LD_OPTS += -lxml2 -lc_utils
LoadModule mod_xmltools_module modules/mod_xmltools.so \n \
to this: \n \
LoadModule mod_xmltools modules/mod_xmltools.so"
+ @echo "Also, you can add \nXMLToolsDefaultLocale <locale>\nand\n \
+ XMLToolsLocaleDir <web-locale-dir> to httpd.conf"
@echo "-----------------------------------------------";
@sleep 3;
char* locale_dir = cfg->locale_dir;
char* default_locale = cfg->default_locale;
- fprintf(stderr, "%s : %s\n", locale_dir, default_locale );
- fflush(stderr);
-
/* we accept get/post requests */
r->allowed |= (AP_METHOD_BIT << M_GET);
r->allowed |= (AP_METHOD_BIT << M_POST);
return HTTP_INTERNAL_SERVER_ERROR;
}
+ fflush(stderr);
+
/* process xincludes */
if( xmlXIncludeProcess(doc) < 0 ) {
fprintf(stderr, "\n ^-- Error processing XIncludes for file %s\n", file);
return HTTP_INTERNAL_SERVER_ERROR;
}
+ fflush(stderr);
/* replace the DTD */
if(xmlReplaceDtd(doc, dtdfile) < 0) {
#include "xmltools.h"
+
+#ifdef XMLTOOLS_DEBUG // standalone debugging
+
+int main(int argc, char* argv[]) {
+
+ char* file = argv[1];
+ char* dtdfile = argv[2];
+
+ xmlDocPtr doc;
+
+
+ /*
+ xmlSubstituteEntitiesDefault(0);
+ xmlParserCtxtPtr ctxt = xmlNewParserCtxt();
+ doc = xmlCtxtReadFile(ctxt, file, NULL, XML_PARSE_NOENT | XML_PARSE_RECOVER | XML_PARSE_XINCLUDE | XML_PARSE_NOERROR | XML_PARSE_NOWARNING );
+ if(doc != NULL)
+ fprintf(stderr, "What we have so far:\n%s\n", xmlDocToString(doc, 1));
+ else {
+ fprintf(stderr, "NO Doc\n");
+ return 0;
+ }
+
+ exit(99);
+ */
+
+ /* parse the doc */
+ if( (doc = xmlParseFile(file)) == NULL) {
+ fprintf(stderr, "\n ^-- Error parsing XML file %s\n", file);
+ fflush(stderr);
+ return 99;
+ }
+
+ /* process xincludes */
+ if( xmlXIncludeProcessFlags(doc, XML_PARSE_NOENT) < 0 ) {
+ fprintf(stderr, "\n ^-- Error processing XIncludes for file %s\n", file);
+ if(doc != NULL)
+ fprintf(stderr, "What we have so far:\n%s\n", xmlDocToString(doc, 1));
+ fflush(stderr);
+ return 99;
+ }
+
+
+ /* replace the DTD */
+ if(xmlReplaceDtd(doc, dtdfile) < 0) {
+ fprintf(stderr, "Error replacing DTD file with file %s\n", dtdfile);
+ fflush(stderr);
+ return 99;
+ }
+
+ /* force DTD entity replacement */
+ doc = xmlProcessDtdEntities(doc);
+
+ /* stringify */
+ char* xml = xmlDocToString(doc, 0);
+
+ fprintf(stderr, "%s\n", xml);
+
+ /* deallocate */
+ free(dtdfile);
+ free(xml);
+ xmlFreeDoc(doc);
+ xmlCleanupCharEncodingHandlers();
+ xmlCleanupParser();
+
+
+}
+
+#endif
+
xmlDocPtr xmlProcessDtdEntities(xmlDocPtr doc) {
char* xml = xmlDocToString(doc, 1);
xmlFreeDoc(doc);
#include <libxml/xmlwriter.h>
#include <libxml/xmlreader.h>
-#include "apachetools.h"
-
#ifndef XMLTOOLS_H
#define XMLTOOLS_H
<?xml version='1.0'?>
+<!DOCTYPE x [ <!ENTITY % ent SYSTEM "locale/en-US/lang.dtd"> %ent; ] >
<!-- Advanced search page -->
<?xml version='1.0'?>
+<!DOCTYPE x [ <!ENTITY % ent SYSTEM "locale/en-US/lang.dtd"> %ent; ] >
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en" lang="en">
<head>
<title>Evergreen: Home</title>
<link rel='stylesheet' type='text/css' href='/css/opac/opac.css'/>
- <xi:include href="js_common.xml"/>
+ <xi:include href="js_common.xml#xpointer(//script)"/>
</head>
<body onload="init();">
--- /dev/null
+<!ENTITY nbsp " ">
+
+<!-- Navigations links -->
+<!ENTITY navigate.home "Home">
+<!ENTITY navigate.home.title "Go to the Home page">
+<!ENTITY navigate.advanced "Advanced Search">
+<!ENTITY navigate.advanced.title "Go to the Advanced Search Page">
+
+
<?xml version='1.0'?>
+<!DOCTYPE x [ <!ENTITY % ent SYSTEM "locale/en-US/lang.dtd"> %ent; ] >
<div id='login_box' class='hide_me'>
<?xml version='1.0'?>
+<!DOCTYPE x [ <!ENTITY % ent SYSTEM "locale/en-US/lang.dtd"> %ent; ] >
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en" lang="en">
<?xml version='1.0'?>
+<!DOCTYPE x [ <!ENTITY % ent SYSTEM "../locale/en-US/lang.dtd"> %ent; ] >
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en" lang="en">
<?xml version='1.0'?>
+<!DOCTYPE x [ <!ENTITY % ent SYSTEM "locale/en-US/lang.dtd"> %ent; ] >
<div id='canvas_main' xmlns:xi="http://www.w3.org/2001/XInclude" >
<!-- simple next/prev type navigation links -->
<td id='next_prev_links'>
<a id='home_link' title="First results page">Start</a>
- <span> </span>
+ <span> </span>
<a id='prev_link' title='Previus page'> << </a>
- <span> </span>
+ <span> </span>
<span id='page_numbers'> </span>
<a id='next_link' title='Next Page'> >> </a>
- <span> </span>
+ <span> </span>
<a id='end_link' title="Last results page">End</a>
</td>
<?xml version='1.0'?>
+<!DOCTYPE x [ <!ENTITY % ent SYSTEM "locale/en-US/lang.dtd"> %ent; ] >
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en" lang="en">
<?xml version='1.0'?>
+<!DOCTYPE x [ <!ENTITY % ent SYSTEM "locale/en-US/lang.dtd"> %ent; ] >
<!-- Navigation bar -->
<div class='sidebar_chunk'>
- <div title="Go to the Home Page"
+ <div title="&navigate.home.title;"
id='home_link_div' class="side_bar_item">
- <a href='/webxml/index.xml'>Home</a>
+ <a href='/webxml/index.xml'>&navigate.home;</a>
</div>
- <div title="Go to the Advanced Search Page"
+ <div title="&navigate.advanced.title;"
id='advanced_link_div' class="side_bar_item">
- <a href='/webxml/advanced.xml'>Advanced Search</a>
+ <a href='/webxml/advanced.xml'>&navigate.advanced;</a>
</div>
<div title="Got to the MyOPAC Page"
JSERVERSOCK="$PREFIX/var/sock/jserver.sock"; # jabber server socket file
JSERVERLOG="$LOGDIR/jserver.log" # jabber server log
JSERVERPORT=5222; # jabber server port
-JSERVERLEVEL=4; # can be 1-4, 4 is the highest
+JSERVERLEVEL=3; # can be 1-4, 4 is the highest
ROUTERLOG="$LOGDIR/router.log" # jabber router log
# --------------------------------------------------------------------------
# --------------------------------------------------------------------------
3 Info
4 debug
-->
- <level>4</level>
+ <level>3</level>
</log>
function buildConfig {
-# if [ -f "$CONFIG_FILE" ]; then
-# echo "";
-# echo "Using existing config file \"$CONFIG_FILE\"";
-# echo "To generate a new config, remove \"$CONFIG_FILE\"";
-# echo "";
-# sleep 3;
-# exit 0;
-# fi
-
-
if [ -f "$DEFAULT_CONFIG_FILE" ]; then
source "$DEFAULT_CONFIG_FILE";
fi;
;;
"opensrf_gateway" )
- if building; then $MAKE -C "$OPENSRFDIR" "gateway"; fi;
- if building; then $MAKE -C "$OPENSRFDIR" "rest_gateway"; fi;
+ if building; then
+ $MAKE -C "$OPENSRFDIR" "gateway";
+ $MAKE -C "$OPENSRFDIR" "rest_gateway";
+ fi;
+
if installing; then $MAKE -C "$OPENSRFDIR" "gateway-install"; fi;
;;
;;
"openils_web" )
+ if building; then $MAKE -C "$OPENILSDIR" "mod_xmltools"; fi;
if installing; then $MAKE -C "$OPENILSDIR" "web-install"; fi;
;;