moved xml to new mod_xmlbuilder style (sans explicit DTD)
authorerickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Wed, 9 Nov 2005 23:18:56 +0000 (23:18 +0000)
committererickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Wed, 9 Nov 2005 23:18:56 +0000 (23:18 +0000)
git-svn-id: svn://svn.open-ils.org/ILS/trunk@1993 dcc99617-32d9-48b4-a31d-7c20da2025e4

25 files changed:
Open-ILS/src/apachemods/mod_xmlbuilder.c
Open-ILS/web/opac/locale/en-US/lang.dtd
Open-ILS/web/opac/skin/default/xml/advanced.xml
Open-ILS/web/opac/skin/default/xml/css_common.xml
Open-ILS/web/opac/skin/default/xml/homesearch.xml
Open-ILS/web/opac/skin/default/xml/index.xml
Open-ILS/web/opac/skin/default/xml/login.xml
Open-ILS/web/opac/skin/default/xml/mresult.xml
Open-ILS/web/opac/skin/default/xml/myopac.xml
Open-ILS/web/opac/skin/default/xml/myopac_checked.xml
Open-ILS/web/opac/skin/default/xml/myopac_fines.xml
Open-ILS/web/opac/skin/default/xml/myopac_holds.xml
Open-ILS/web/opac/skin/default/xml/myopac_prefs.xml
Open-ILS/web/opac/skin/default/xml/myopac_summary.xml
Open-ILS/web/opac/skin/default/xml/orgtree.xml
Open-ILS/web/opac/skin/default/xml/rdetail.xml
Open-ILS/web/opac/skin/default/xml/rdetail_altcanvas.xml
Open-ILS/web/opac/skin/default/xml/rdetail_copyinfo.xml
Open-ILS/web/opac/skin/default/xml/rdetail_summary.xml
Open-ILS/web/opac/skin/default/xml/result_common.xml
Open-ILS/web/opac/skin/default/xml/result_table.xml
Open-ILS/web/opac/skin/default/xml/rresult.xml
Open-ILS/web/opac/skin/default/xml/searchbar.xml
Open-ILS/web/opac/skin/default/xml/sidebar.xml
Open-ILS/web/opac/skin/default/xml/statusbar.xml

index 14f9d49..f88f6af 100644 (file)
@@ -93,7 +93,6 @@ static int xmlBuilderHandler( request_rec* r ) {
        if(locale) __xmlBuilderDynamicLocale = locale;
        char* XMLFile = r->filename;
 
-       apacheDebug("Processing file %s", XMLFile);
        xmlDocPtr doc = xmlBuilderProcessFile( XMLFile, config );
        if(!doc) return apacheError( "Unable to parse XML file %s", XMLFile );
 
@@ -161,7 +160,6 @@ xmlDocPtr xmlBuilderProcessFile( char* filename, xmlBuilderConfig* config ) {
 
 
 void xmlBuilderStartElement( void* context, const xmlChar *name, const xmlChar **atts ) {
-       apacheDebug( "Starting element: %s", name );
        xmlBuilderContext* ctx = (xmlBuilderContext*) context;
 
        xmlNodePtr node = NULL;
@@ -189,7 +187,6 @@ void xmlBuilderStartElement( void* context, const xmlChar *name, const xmlChar *
                        }
 
 
-                       apacheDebug( "Processing xinclude %s", href );
                        xmlDocPtr subDoc = xmlBuilderProcessFile( href, ctx->config );
                        node = xmlDocGetRootElement( subDoc );
                }
@@ -274,7 +271,6 @@ void xmlBuilderAddDtd( const char* sysId, xmlBuilderContext* context ) {
        char buf[len]; bzero(buf,len);
        snprintf( buf, len, "%s/%s/%s", context->config->baseDir, locale, sysId );
 
-       apacheDebug("Parsing DTD file %s", buf);
        xmlDtdPtr dtd = xmlParseDTD(NULL, buf);
 
 
@@ -317,23 +313,3 @@ module AP_MODULE_DECLARE_DATA xmlbuilder_module = {
 
 
 
-
-/*
-char* get_dtd_lang_file(string_array* params, char* default_locale, char* locale_dir) {
-
-       char* locale = apacheGetFirstParamValue(params, PARAM_LOCALE);
-       if(!locale) locale = default_locale;
-       if(!locale) return NULL;
-
-       int len = strlen(LANG_DTD) + strlen(locale) + strlen(locale_dir) + 1;
-       char dtdfile[len];
-       bzero(dtdfile, len);
-
-       if(locale)
-               sprintf(dtdfile, "%s/%s/%s",  locale_dir, locale, LANG_DTD );
-
-       return strdup(dtdfile);
-}
-*/
-
-
index f924732..40a8223 100644 (file)
@@ -1,4 +1,7 @@
 <!ENTITY nbsp "  ">
+<!ENTITY space "&nsbp;">
+<!ENTITY llt "&lt;">
+<!ENTITY gt ">">
 
 <!-- Navigations links -->
 <!ENTITY navigate.home "Home">
index 81fb753..3f6a5df 100644 (file)
@@ -1,5 +1,4 @@
 <?xml version='1.0'?>
-<!DOCTYPE x [ <!ENTITY % ent SYSTEM "../../../locale/en-US/lang.dtd"> %ent; ] >
 
 <!-- Advanced search page -->
 
@@ -8,8 +7,8 @@
 
        <head>
                <title>Evergreen: Advanced Search</title>
-               <xi:include href="css_common.xml#xpointer(//link)"/>
-               <xi:include href="js_common.xml#xpointer(//script)"/>
+               <xi:include href="css_common.xml"/>
+               <xi:include href="js_common.xml"/>
        </head>
 
        <body onload="init();">
index 5435888..6ee1881 100644 (file)
@@ -15,7 +15,9 @@
        <link type='text/css' rel="stylesheet" href="../../../theme/default/css/colors.css"  
                name='Default' csstype='color'/>
 
+       <!--
        <link type='text/css' rel="alternate stylesheet" href="../../../theme/test/css/colors.css" 
                title='Color Test' name='ColorTest' csstype="color" />
+               -->
 
 </css>
index ce6cd06..d60b2a0 100644 (file)
@@ -1,5 +1,4 @@
 <?xml version='1.0'?>
-<!DOCTYPE x [ <!ENTITY % ent SYSTEM "../../../locale/en-US/lang.dtd"> %ent; ] >
 
 <div id='canvas_main' 
        style='border: 3px solid #A7EA9D; -moz-border-radius: 6px; padding: 6px; margin-top: 65px;' 
index 4bbd6c7..ba2056a 100644 (file)
@@ -1,11 +1,11 @@
 <?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">
 
        <head>
                <title>Evergreen: Home</title>
-               <xi:include href="css_common.xml#xpointer(//link)"/>
+               <xi:include href="css_common.xml"/>
                <script language='javascript' src='../../../common/js/utils.js'> </script>
                <script language='javascript' src='../../../common/js//config.js'> </script>
                <script language='javascript' src='../../../common/js/CGI.js'> </script>
index 7d24b4c..3a8dbab 100644 (file)
@@ -1,6 +1,4 @@
 <?xml version='1.0'?>
-<!DOCTYPE x [ <!ENTITY % ent SYSTEM "../../../locale/en-US/lang.dtd"> %ent; ] >
-
 
 <div id='login_box' class='hide_me color_1 non_canvas' style='margin-top: 6px;'>
 
index 766fc4a..a31987e 100644 (file)
@@ -1,12 +1,11 @@
 <?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">
 
        <head>
                <title>Evergreen: Title Groups</title>
-               <xi:include href="css_common.xml#xpointer(//link)"/>
-               <xi:include href="js_common.xml#xpointer(//script)"/>
+               <xi:include href="css_common.xml"/>
+               <xi:include href="js_common.xml"/>
                <script language='javascript' src='../js/mresult.js'> </script>
                <script language='javascript' src='../js/result_common.js'> </script>
        </head>
index 565e13f..aecc9d1 100644 (file)
@@ -1,12 +1,11 @@
 <?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">
 
        <head>
                <title>Evergreen: My OPAC</title>
-               <xi:include href="css_common.xml#xpointer(//link)"/>
-               <xi:include href="js_common.xml#xpointer(//script)"/>
+               <xi:include href="css_common.xml"/>
+               <xi:include href="js_common.xml"/>
                <script language='javascript' src='../js/myopac.js'> </script>
 
                <!-- overwrite the fieldmapper code with the extended fieldmapper code -->
index 8cec4d3..f3a7340 100644 (file)
@@ -1,5 +1,4 @@
 <?xml version='1.0'?>
-<!DOCTYPE x [ <!ENTITY % ent SYSTEM "../../../locale/en-US/lang.dtd"> %ent; ] >
 
 <div id='myopac_checked_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
index bb607dc..d09ddad 100644 (file)
@@ -1,5 +1,4 @@
 <?xml version='1.0'?>
-<!DOCTYPE x [ <!ENTITY % ent SYSTEM "../../../locale/en-US/lang.dtd"> %ent; ] >
 
 <div id='myopac_fines_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
index c2b75b9..b88ce1b 100644 (file)
@@ -1,5 +1,4 @@
 <?xml version='1.0'?>
-<!DOCTYPE x [ <!ENTITY % ent SYSTEM "../../../locale/en-US/lang.dtd"> %ent; ] >
 
 <div id='myopac_holds_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
index 478e949..d24fea3 100644 (file)
@@ -1,5 +1,4 @@
 <?xml version='1.0'?>
-<!DOCTYPE x [ <!ENTITY % ent SYSTEM "../../../locale/en-US/lang.dtd"> %ent; ] >
 
 <div id='myopac_prefs_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
index b82d29f..2587bfb 100644 (file)
@@ -1,5 +1,4 @@
 <?xml version='1.0'?>
-<!DOCTYPE x [ <!ENTITY % ent SYSTEM "../../../locale/en-US/lang.dtd"> %ent; ] >
 
 <div id='myopac_summary_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
index 26d6263..fc4e2cc 100644 (file)
@@ -1,5 +1,4 @@
 <?xml version='1.0'?>
-<!DOCTYPE x [ <!ENTITY % ent SYSTEM "../../../locale/en-US/lang.dtd"> %ent; ]>
 
 <!-- the org tree -->
 <div id='org_container' class='hide_me non_canvas'>
index 0314037..43ffdd8 100644 (file)
@@ -1,13 +1,12 @@
 <?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: Titles</title>
-               <xi:include href="css_common.xml#xpointer(//link)"/>
-               <xi:include href="js_common.xml#xpointer(//script)"/>
+               <xi:include href="css_common.xml"/>
+               <xi:include href="js_common.xml"/>
                <script language='javascript' src='../js/rdetail.js'> </script>
        </head>
 
index 86bb39a..c7b3784 100644 (file)
@@ -1,5 +1,4 @@
 <?xml version='1.0'?>
-<!DOCTYPE x [ <!ENTITY % ent SYSTEM "../../../locale/en-US/lang.dtd"> %ent; ] >
 
 <!-- record details alternate canvases -->
 <div class=''>
index dc1c527..860d64d 100644 (file)
@@ -1,5 +1,4 @@
 <?xml version='1.0'?>
-<!DOCTYPE x [ <!ENTITY % ent SYSTEM "../../../locale/en-US/lang.dtd"> %ent; ] >
 
 <!-- This holds information for copies attached to this record -->
 <div>
index fc94528..623a10f 100644 (file)
@@ -1,5 +1,4 @@
 <?xml version='1.0'?>
-<!DOCTYPE x [ <!ENTITY % ent SYSTEM "../../../locale/en-US/lang.dtd"> %ent; ] >
 
 <!-- This holds the record summary information -->
 <div>
index 99b60dc..dd69fd4 100644 (file)
@@ -1,5 +1,4 @@
 <?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" >
 
index 0eb832c..3495506 100644 (file)
@@ -1,5 +1,4 @@
 <?xml version='1.0'?>
-<!DOCTYPE x [ <!ENTITY % ent SYSTEM "../../../locale/en-US/lang.dtd"> %ent; ] >
 
 <!-- Search results are spit into this table -->
 
@@ -41,7 +40,7 @@
 
                                                                        <span style='padding-left: 40px;' >
                                                                                <a class='search_page_nav_link' id='search_home_link' title="First results page">Start</a>
-                                                                               <a class='search_page_nav_link' id='prev_link' title='Previus page'> &lt;&lt; </a>
+                                                                               <a class='search_page_nav_link' id='prev_link' title='Previus page'> &llt;&llt; </a>
                                                                                <span class='search_page_nav_link' id='page_numbers'> </span>
                                                                                <a  class='search_page_nav_link' id='next_link' title='Next Page'> &gt;&gt; </a>
                                                                                <a  class='search_page_nav_link' id='end_link' title="Last results page">End</a>
index 6c83119..e8fcec9 100644 (file)
@@ -1,13 +1,12 @@
 <?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: Titles</title>
-               <xi:include href="css_common.xml#xpointer(//link)"/>
-               <xi:include href="js_common.xml#xpointer(//script)"/>
+               <xi:include href="css_common.xml"/>
+               <xi:include href="js_common.xml"/>
                <script language='javascript' src='../js/rresult.js'> </script>
                <script language='javascript' src='../js/result_common.js'> </script>
        </head>
index fc5645a..d2fa5d9 100644 (file)
@@ -1,5 +1,4 @@
 <?xml version='1.0'?>
-<!DOCTYPE x [ <!ENTITY % ent SYSTEM "../../../locale/en-US/lang.dtd"> %ent; ] >
 
 <!-- Searchbar for doing metarecord searches -->
 
index 8babb11..c979dca 100644 (file)
@@ -1,5 +1,4 @@
 <?xml version='1.0'?>
-<!DOCTYPE x [ <!ENTITY % ent SYSTEM "../../../locale/en-US/lang.dtd"> %ent; ] >
 
 <!-- Navigation bar -->
 
index 4c056e2..cab1711 100644 (file)
@@ -1,5 +1,4 @@
 <?xml version='1.0'?>
-<!DOCTYPE x [ <!ENTITY % ent SYSTEM "../../../locale/en-US/lang.dtd"> %ent; ] >
 
 <div id='statusbar' style='margin-bottom: 6px; margin-top: 6px;'>