Changeset 33648

Show
Ignore:
Timestamp:
12.11.2019 12:04:03 (4 weeks ago)
Author:
kjdon
Message:

changed the debuginfo xsl and strings to match the new o=xxx debug options

Location:
main/trunk/greenstone3/web
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/web/WEB-INF/classes/interface_default2.properties

    r33484 r33648  
    105105debuginfo.oaiserver=oaiserver servlet 
    106106debuginfo.intermediateview=Viewing intermediate stages of page preparation 
    107 debuginfo.usage=When debugging the XSLT, you can append any of the following to the URL (prefixed with a & or ? as appropriate) to see the intermediate XML that's produced. 
    108 debuginfo.xml=Displays the raw XML information coming from the Message Router. 
    109 debuginfo.xmlfinal=Displays the information coming from the Message Router after the second config_format pass. 
    110 debuginfo.skindoc=Simplified Skin XSL with Expanded GSF statements appended. 
    111 debuginfo.skinandlib=An XML document with a root element called skinAndLibraryXsl and the two children skinXsl and libraryXsl. The libraryXsl, which already includes util.xsl, is merely appended. 
    112 debuginfo.skinandlibdoc=The result of applying preprocess.xsl to skinandlib produces this stylesheet.  
    113 debuginfo.skinandlibdocfinal=This one actually is the final XSLT document. The result of applying config_format.xsl and text_fragment_format.xsl to skinandlibdoc. This is the XSLT document that will be applied to the XML data returned from the message router. 
     107debuginfo.intview_desc=To make the HTML page, we produce a page of XML with all the content in it. That gets transformed by XSLT to produce the HTML output. 
     108debuginfo.usage=When debugging the HTML page generation process, you can append any of the following to the URL (prefixed with a & or ? as appropriate) to see the intermediate stages of page production. 
     109debuginfo.xml=Displays the page XML. 
     110debuginfo.format=Displays the format statements extracted from the page XML and converted into proper XSL  - i.e. all GSF elements converted to XSL. 
     111debuginfo.format1=Displays the raw format statements extracted from the page XML. These are the format options and templates that come from configuration files (collection, site etc).  
     112debuginfo.ilt=Displays the inline template that was sent as a cgi argument (ilt=). Inline templates are used in ajax calls when we only want part of the page returned - e.g. for dynamically loading one section of a document. 
     113debuginfo.gslib=Displays the gslib XSL, after includes/imports have been added. 
     114debuginfo.gslib1=Displays the gslib XSL, before includes/imports have been added. 
     115debuginfo.expandgslib=Displays the expand-gslib XSL (that is used to merge the gslib with the main page XSL) 
     116debuginfo.xsl=The final XSL that will be used to transform the page XML. Format elements and inline templates have been added in, with any include/import files inlined. gslib and gsf elements have been transformed to proper XSL.  
     117debuginfo.xsl1=The original page XSL (eg pages/about.xsl) - generated by merging all inheriting variants of the file. We look for the file in base interface, current interface, site, collection, with templates from the latter overriding the former. 
     118debuginfo.xsl2=The page XSL with format elements (options and templates from the collection/site configuration files) added in. 
     119debuginfo.xsl3=The page XSL with format elements and inline templates added in. Inline templates are XSL fragments sent as the ilt cgi argument. 
     120debuginfo.xsl4=The page XSL with format elements and inline templates added in, with any include/import files inlined. 
     121debuginfo.xsl5=The page XSL with gslib attached, in pageAndGslibXSL document. Ready for processing by expand-gslib.xsl. 
     122debuginfo.xsl6=The page XSL with format elements and inline templates added in, with any include/import files inlined. gslib elements have been transformed to proper XSL. 
     123debuginfo.xsl7=The page XSL with format elements and inline templates added in, with any include/import files inlined. gslib elements have been transformed to proper XSL. The first pass of transforming GSF elements to XSL has been done.  
    114124debuginfo.formatedit=Web interface editor for editing Greenstone3 format statements. 
    115125debuginfo.refreshconfig=Refresh all the collection configuration files: 
  • main/trunk/greenstone3/web/interfaces/default/transform/pages/debuginfo.xsl

    r33486 r33648  
    2727    <h2><xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.library')"/></h2> 
    2828    <p> 
     29      <xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.intview_desc')"/> 
     30    </p> 
     31    <p> 
    2932      <xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.usage')"/> 
    3033    </p> 
     
    3639    <xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.xml')"/> 
    3740      </dd> 
    38       <dt>o=xmlfinal</dt> 
     41      <dt>o=xsl</dt> 
    3942      <dd> 
    40     <xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.xmlfinal')"/> 
     43    <xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.xsl')"/> 
     44    <dl> 
     45      <dt>o=xsl7</dt> 
     46      <dd><xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.xsl7')"/></dd> 
     47      <dt>o=xsl6</dt> 
     48      <dd><xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.xsl6')"/></dd> 
     49      <dt>o=xsl5</dt> 
     50      <dd><xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.xsl5')"/></dd> 
     51      <dt>o=xsl4</dt> 
     52      <dd><xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.xsl4')"/></dd> 
     53      <dt>o=xsl3</dt> 
     54      <dd><xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.xsl3')"/></dd> 
     55      <dt>o=xsl2</dt> 
     56      <dd><xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.xsl2')"/></dd> 
     57      <dt>o=xsl1</dt> 
     58      <dd><xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.xsl1')"/></dd> 
     59    </dl> 
    4160      </dd> 
    42       <dt>o=skinandlibdocfinal</dt> 
     61      <dt>o=format</dt> 
    4362      <dd> 
    44     <xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.skinandlibdocfinal')"/> 
     63    <xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.format')"/> 
     64    <dl> 
     65    <dt>o=format1</dt> 
     66    <dd><xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.format1')"/></dd> 
     67    </dl> 
    4568      </dd> 
    46       <dt>o=skindoc</dt> 
     69      <dt>o=ilt</dt> 
    4770      <dd> 
    48     <xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.skindoc')"/> 
     71    <xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.ilt')"/> 
    4972      </dd> 
    50       <dt>o=skinandlib</dt> 
     73      <dt>o=gslib</dt> 
    5174      <dd> 
    52     <xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.skinandlib')"/> 
     75    <xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.gslib')"/> 
     76    <dl> 
     77    <dt>o=gslib1</dt> 
     78    <dd><xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.gslib1')"/></dd> 
     79    </dl> 
    5380      </dd> 
    54       <dt>o=skinandlibdoc</dt> 
     81      <dt>o=gslib-expander</dt> 
    5582      <dd> 
    56     <xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.skinandlibdoc')"/> 
     83    <xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.expandgslib')"/> 
    5784      </dd> 
    58       <dt>formatedit=on</dt> 
    59       <dd> 
    60     <xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.formatedit')"/> 
    61       </dd> 
     85 
    6286    </dl> 
    6387 
     
    92116    <xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.inlinetemplate')"/> 
    93117      </dd> 
    94     </dl> 
    95     <dl> 
    96118      <dt>dmd= 
    97119      </dt> 
    98120      <dd> 
    99121    <xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.displaymetadata')"/> 
     122      </dd> 
     123      <dt>formatedit=on</dt> 
     124      <dd> 
     125    <xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.formatedit')"/> 
    100126      </dd> 
    101127    </dl> 
     
    109135    <xsl:value-of select="util:getInterfaceText($debug_property_file, /page/@lang, 'debuginfo.depositor')"/> 
    110136      </dd> 
     137 
    111138    </dl> 
    112139