From c855370540b3fb409d006018ae5a2d2259d6bd6c Mon Sep 17 00:00:00 2001 From: erickson Date: Wed, 9 Nov 2005 23:18:56 +0000 Subject: [PATCH] moved xml to new mod_xmlbuilder style (sans explicit DTD) git-svn-id: svn://svn.open-ils.org/ILS/trunk@1993 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/apachemods/mod_xmlbuilder.c | 24 ------------------- Open-ILS/web/opac/locale/en-US/lang.dtd | 3 +++ .../web/opac/skin/default/xml/advanced.xml | 5 ++-- .../web/opac/skin/default/xml/css_common.xml | 2 ++ .../web/opac/skin/default/xml/homesearch.xml | 1 - Open-ILS/web/opac/skin/default/xml/index.xml | 4 ++-- Open-ILS/web/opac/skin/default/xml/login.xml | 2 -- .../web/opac/skin/default/xml/mresult.xml | 5 ++-- Open-ILS/web/opac/skin/default/xml/myopac.xml | 5 ++-- .../opac/skin/default/xml/myopac_checked.xml | 1 - .../opac/skin/default/xml/myopac_fines.xml | 1 - .../opac/skin/default/xml/myopac_holds.xml | 1 - .../opac/skin/default/xml/myopac_prefs.xml | 1 - .../opac/skin/default/xml/myopac_summary.xml | 1 - .../web/opac/skin/default/xml/orgtree.xml | 1 - .../web/opac/skin/default/xml/rdetail.xml | 5 ++-- .../skin/default/xml/rdetail_altcanvas.xml | 1 - .../skin/default/xml/rdetail_copyinfo.xml | 1 - .../opac/skin/default/xml/rdetail_summary.xml | 1 - .../opac/skin/default/xml/result_common.xml | 1 - .../opac/skin/default/xml/result_table.xml | 3 +-- .../web/opac/skin/default/xml/rresult.xml | 5 ++-- .../web/opac/skin/default/xml/searchbar.xml | 1 - .../web/opac/skin/default/xml/sidebar.xml | 1 - .../web/opac/skin/default/xml/statusbar.xml | 1 - 25 files changed, 18 insertions(+), 59 deletions(-) diff --git a/Open-ILS/src/apachemods/mod_xmlbuilder.c b/Open-ILS/src/apachemods/mod_xmlbuilder.c index 14f9d4936d..f88f6af66b 100644 --- a/Open-ILS/src/apachemods/mod_xmlbuilder.c +++ b/Open-ILS/src/apachemods/mod_xmlbuilder.c @@ -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); -} -*/ - - diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd index f92473239b..40a82236e1 100644 --- a/Open-ILS/web/opac/locale/en-US/lang.dtd +++ b/Open-ILS/web/opac/locale/en-US/lang.dtd @@ -1,4 +1,7 @@ + + +"> diff --git a/Open-ILS/web/opac/skin/default/xml/advanced.xml b/Open-ILS/web/opac/skin/default/xml/advanced.xml index 81fb753671..3f6a5dfb7c 100644 --- a/Open-ILS/web/opac/skin/default/xml/advanced.xml +++ b/Open-ILS/web/opac/skin/default/xml/advanced.xml @@ -1,5 +1,4 @@ - %ent; ] > @@ -8,8 +7,8 @@ Evergreen: Advanced Search - - + + diff --git a/Open-ILS/web/opac/skin/default/xml/css_common.xml b/Open-ILS/web/opac/skin/default/xml/css_common.xml index 5435888330..6ee1881c3b 100644 --- a/Open-ILS/web/opac/skin/default/xml/css_common.xml +++ b/Open-ILS/web/opac/skin/default/xml/css_common.xml @@ -15,7 +15,9 @@ + diff --git a/Open-ILS/web/opac/skin/default/xml/homesearch.xml b/Open-ILS/web/opac/skin/default/xml/homesearch.xml index ce6cd067a8..d60b2a0537 100644 --- a/Open-ILS/web/opac/skin/default/xml/homesearch.xml +++ b/Open-ILS/web/opac/skin/default/xml/homesearch.xml @@ -1,5 +1,4 @@ - %ent; ] >
- %ent; ] > + Evergreen: Home - + diff --git a/Open-ILS/web/opac/skin/default/xml/login.xml b/Open-ILS/web/opac/skin/default/xml/login.xml index 7d24b4c0e8..3a8dbab16b 100644 --- a/Open-ILS/web/opac/skin/default/xml/login.xml +++ b/Open-ILS/web/opac/skin/default/xml/login.xml @@ -1,6 +1,4 @@ - %ent; ] > -
diff --git a/Open-ILS/web/opac/skin/default/xml/mresult.xml b/Open-ILS/web/opac/skin/default/xml/mresult.xml index 766fc4a120..a31987e708 100644 --- a/Open-ILS/web/opac/skin/default/xml/mresult.xml +++ b/Open-ILS/web/opac/skin/default/xml/mresult.xml @@ -1,12 +1,11 @@ - %ent; ]> Evergreen: Title Groups - - + + diff --git a/Open-ILS/web/opac/skin/default/xml/myopac.xml b/Open-ILS/web/opac/skin/default/xml/myopac.xml index 565e13fc2f..aecc9d1c49 100644 --- a/Open-ILS/web/opac/skin/default/xml/myopac.xml +++ b/Open-ILS/web/opac/skin/default/xml/myopac.xml @@ -1,12 +1,11 @@ - %ent; ] > Evergreen: My OPAC - - + + diff --git a/Open-ILS/web/opac/skin/default/xml/myopac_checked.xml b/Open-ILS/web/opac/skin/default/xml/myopac_checked.xml index 8cec4d3a37..f3a734003d 100644 --- a/Open-ILS/web/opac/skin/default/xml/myopac_checked.xml +++ b/Open-ILS/web/opac/skin/default/xml/myopac_checked.xml @@ -1,5 +1,4 @@ - %ent; ] >
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac_fines.xml b/Open-ILS/web/opac/skin/default/xml/myopac_fines.xml index bb607dcebd..d09ddada68 100644 --- a/Open-ILS/web/opac/skin/default/xml/myopac_fines.xml +++ b/Open-ILS/web/opac/skin/default/xml/myopac_fines.xml @@ -1,5 +1,4 @@ - %ent; ] >
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac_holds.xml b/Open-ILS/web/opac/skin/default/xml/myopac_holds.xml index c2b75b9dd9..b88ce1bef3 100644 --- a/Open-ILS/web/opac/skin/default/xml/myopac_holds.xml +++ b/Open-ILS/web/opac/skin/default/xml/myopac_holds.xml @@ -1,5 +1,4 @@ - %ent; ] >
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac_prefs.xml b/Open-ILS/web/opac/skin/default/xml/myopac_prefs.xml index 478e949fce..d24fea3c46 100644 --- a/Open-ILS/web/opac/skin/default/xml/myopac_prefs.xml +++ b/Open-ILS/web/opac/skin/default/xml/myopac_prefs.xml @@ -1,5 +1,4 @@ - %ent; ] >
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac_summary.xml b/Open-ILS/web/opac/skin/default/xml/myopac_summary.xml index b82d29f3c9..2587bfb8b7 100644 --- a/Open-ILS/web/opac/skin/default/xml/myopac_summary.xml +++ b/Open-ILS/web/opac/skin/default/xml/myopac_summary.xml @@ -1,5 +1,4 @@ - %ent; ] >
diff --git a/Open-ILS/web/opac/skin/default/xml/orgtree.xml b/Open-ILS/web/opac/skin/default/xml/orgtree.xml index 26d6263632..fc4e2cc4eb 100644 --- a/Open-ILS/web/opac/skin/default/xml/orgtree.xml +++ b/Open-ILS/web/opac/skin/default/xml/orgtree.xml @@ -1,5 +1,4 @@ - %ent; ]>
diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail.xml b/Open-ILS/web/opac/skin/default/xml/rdetail.xml index 0314037929..43ffdd8009 100644 --- a/Open-ILS/web/opac/skin/default/xml/rdetail.xml +++ b/Open-ILS/web/opac/skin/default/xml/rdetail.xml @@ -1,13 +1,12 @@ - %ent; ] > Evergreen: Titles - - + + diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail_altcanvas.xml b/Open-ILS/web/opac/skin/default/xml/rdetail_altcanvas.xml index 86bb39a87f..c7b37847c8 100644 --- a/Open-ILS/web/opac/skin/default/xml/rdetail_altcanvas.xml +++ b/Open-ILS/web/opac/skin/default/xml/rdetail_altcanvas.xml @@ -1,5 +1,4 @@ - %ent; ] >
diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail_copyinfo.xml b/Open-ILS/web/opac/skin/default/xml/rdetail_copyinfo.xml index dc1c5271a0..860d64d761 100644 --- a/Open-ILS/web/opac/skin/default/xml/rdetail_copyinfo.xml +++ b/Open-ILS/web/opac/skin/default/xml/rdetail_copyinfo.xml @@ -1,5 +1,4 @@ - %ent; ] >
diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail_summary.xml b/Open-ILS/web/opac/skin/default/xml/rdetail_summary.xml index fc9452814f..623a10f927 100644 --- a/Open-ILS/web/opac/skin/default/xml/rdetail_summary.xml +++ b/Open-ILS/web/opac/skin/default/xml/rdetail_summary.xml @@ -1,5 +1,4 @@ - %ent; ] >
diff --git a/Open-ILS/web/opac/skin/default/xml/result_common.xml b/Open-ILS/web/opac/skin/default/xml/result_common.xml index 99b60dce27..dd69fd4654 100644 --- a/Open-ILS/web/opac/skin/default/xml/result_common.xml +++ b/Open-ILS/web/opac/skin/default/xml/result_common.xml @@ -1,5 +1,4 @@ - %ent; ] >
diff --git a/Open-ILS/web/opac/skin/default/xml/result_table.xml b/Open-ILS/web/opac/skin/default/xml/result_table.xml index 0eb832c818..349550676b 100644 --- a/Open-ILS/web/opac/skin/default/xml/result_table.xml +++ b/Open-ILS/web/opac/skin/default/xml/result_table.xml @@ -1,5 +1,4 @@ - %ent; ] > @@ -41,7 +40,7 @@ Start - << + &llt;&llt; >> End diff --git a/Open-ILS/web/opac/skin/default/xml/rresult.xml b/Open-ILS/web/opac/skin/default/xml/rresult.xml index 6c83119f36..e8fcec9829 100644 --- a/Open-ILS/web/opac/skin/default/xml/rresult.xml +++ b/Open-ILS/web/opac/skin/default/xml/rresult.xml @@ -1,13 +1,12 @@ - %ent; ] > Evergreen: Titles - - + + diff --git a/Open-ILS/web/opac/skin/default/xml/searchbar.xml b/Open-ILS/web/opac/skin/default/xml/searchbar.xml index fc5645a0d2..d2fa5d9e16 100644 --- a/Open-ILS/web/opac/skin/default/xml/searchbar.xml +++ b/Open-ILS/web/opac/skin/default/xml/searchbar.xml @@ -1,5 +1,4 @@ - %ent; ] > diff --git a/Open-ILS/web/opac/skin/default/xml/sidebar.xml b/Open-ILS/web/opac/skin/default/xml/sidebar.xml index 8babb11fa5..c979dca4ed 100644 --- a/Open-ILS/web/opac/skin/default/xml/sidebar.xml +++ b/Open-ILS/web/opac/skin/default/xml/sidebar.xml @@ -1,5 +1,4 @@ - %ent; ] > diff --git a/Open-ILS/web/opac/skin/default/xml/statusbar.xml b/Open-ILS/web/opac/skin/default/xml/statusbar.xml index 4c056e2f1c..cab1711b4c 100644 --- a/Open-ILS/web/opac/skin/default/xml/statusbar.xml +++ b/Open-ILS/web/opac/skin/default/xml/statusbar.xml @@ -1,5 +1,4 @@ - %ent; ] >
-- 2.43.2