Renaming exclude.search.from.chunked.html to exclude.search.from.webhelp

diff --git a/xsl/webhelp/build.properties b/xsl/webhelp/build.properties
index eb4a63a864a06c6383583129e6ecf785601a172d..7bfc55e3d174f826926a6ee883ae00594bee754a 100755 (executable)
--- a/xsl/webhelp/build.properties
+++ b/xsl/webhelp/build.properties
@@ -31,7 +31,7 @@ docbookx.dtd=c:/workhead/export/DocBookDTD/4.5/docbookx.dtd
 validate=true
 
 # Set this to true if you don't need a search tab.
-exclude.search.from.chunked.html=false
+exclude.search.from.webhelp=false
 
 # indexer-language is used to tell the search indexer which language
 # the docbook is written.  This will be used to identify the correct

diff --git a/xsl/webhelp/build.xml b/xsl/webhelp/build.xml
index e95613e2a9c2b520392babc8cf39e1b4f74fe9c0..704dd1e2fcc9e3f5f5a14a68ecbb1f521573b021 100755 (executable)
--- a/xsl/webhelp/build.xml
+++ b/xsl/webhelp/build.xml
@@ -17,7 +17,7 @@
        <equals arg1="${validate}" arg2="true"/>
   </condition>
   <condition property="skip-search-indexing">
-       <equals arg1="${exclude.search.from.chunked.html}" arg2="true"/>
+       <equals arg1="${exclude.search.from.webhelp}" arg2="true"/>
   </condition>
 
   <target name="validate" if="perform-validation">
@@ -37,8 +37,8 @@
          classpath="${xslt-processor-classpath}">
          <xmlcatalog refid="catalog"/>
          <param name="chunked.toc.all.open" expression="${chunked.toc.all.open}" if="chunked.toc.all.open"/>
-         <param name="exclude.search.from.chunked.html" expression="${exclude.search.from.chunked.html}"
-               if="exclude.search.from.chunked.html"/>
+         <param name="exclude.search.from.webhelp" expression="${exclude.search.from.webhelp}"
+               if="exclude.search.from.webhelp"/>
          <param name="output_file_name" expression="${output_file_name}"/>
          <param name="webhelp.base.dir" expression="${output-dir}" if="output-dir"/>
          <param name="indexer.language" expression="${indexer-language}" if="indexer-language"/>

diff --git a/xsl/webhelp/xsl/webhelp.xsl b/xsl/webhelp/xsl/webhelp.xsl
index 4a0ff3f9bce1aee809e141387afb3913fad100db..ab0c4026108c22c168356d73326c3cb65e969b3f 100755 (executable)
--- a/xsl/webhelp/xsl/webhelp.xsl
+++ b/xsl/webhelp/xsl/webhelp.xsl
@@ -15,7 +15,7 @@
             cdata-section-elements=""/>
 
     <!-- Custom params! -->
-    <xsl:param name="exclude.search.from.chunked.html">false</xsl:param>
+    <xsl:param name="exclude.search.from.webhelp">false</xsl:param>
     <xsl:param name="chunk.frameset.start.filename">index.html</xsl:param>
     <xsl:param name="output_file_name">readme</xsl:param>
     <xsl:param name="chunked.toc.all.open">1</xsl:param>
@@ -179,7 +179,7 @@
 
         <!--testing toc in the content page>
         <xsl:call-template name="webhelptoctoc"/>
-        <xsl:if test="$exclude.search.from.chunked.html != 'true'">
+        <xsl:if test="$exclude.search.from.webhelp != 'true'">
             <xsl:call-template name="search"/>
         </xsl:if-->
     </xsl:template>
@@ -445,7 +445,7 @@
                                         </em>
                                     </a>
                                 </li>
-                                <xsl:if test="$exclude.search.from.chunked.html != 'true'">
+                                <xsl:if test="$exclude.search.from.webhelp != 'true'">
                                     <li>
                                         <a href="#searchDiv">
                                             <em>
@@ -466,7 +466,7 @@
                                     </xsl:apply-templates>
                                 </ul>
                             </div>
-                            <xsl:if test="$exclude.search.from.chunked.html != 'true'">
+                            <xsl:if test="$exclude.search.from.webhelp != 'true'">
                                 <div id="searchDiv">
                                     <div id="search">
                                         <form onsubmit="Verifie(ditaSearch_Form);return false"