Changeset 26094 for main/trunk

Timestamp:

2012-08-09T17:20:51+12:00 (12 years ago)

Author:

ak19

Message:

Finally properly fixed the appearance and non-appearance of the quick search form. It should not appear if there are no query elements in the config file. However, even when no search indexes were built, query elements still came through in the XML and it was hard to distinguish at the XSLT stage whether any search indexes were built or not. Kathy suggested that the perl code writing out the buildconfig.xml should not write out the ServiceRacks for searching if no indexes were built and pointed out that the changes were required in buildconfigxml.pm which was called from basebuilder.pm to write out the buildConfig.xml file. Now the XSLT can at last do the right thing: it doesn't display the quick search area if there are no search elements, and doesn't provide the plain text query form in the quick search area if TextQuery isn't one of the query types, but does provide the buttons to other query types like form search if these are meant to be visible according to the SearchType format feature. If there are no search indexes built, then there is no quick search area.

Location:

main/trunk

Files:

• greenstone2/perllib/basebuilder.pm (modified) (1 diff)
• greenstone2/perllib/buildConfigxml.pm (modified) (5 diffs)
• greenstone3/web/interfaces/default/transform/layouts/header.xsl (modified) (3 diffs)

main/trunk/greenstone2/perllib/basebuilder.pm

@@ -560 +560 @@
     }
     }
+    
+    # store the number of indexes built to later determine whether search serviceracks get written out to buildConfig.xml
+    $build_cfg->{'num_indexes'} = scalar (@indexmap);   
+    
     $build_cfg->{'indexmap'} = \@indexmap if scalar (@indexmap);
 

main/trunk/greenstone2/perllib/buildConfigxml.pm

@@ -273 +273 @@
     }
     } else {
-    print STDERR "$maptype not defined";
-    }
-
+    print STDERR "$maptype not defined\n";
+    }
+
+    $settings->{'num_indexes'} = $buildcfg->{'num_indexes'};
     $settings->{'defaultindex'} = $defaultindex;
     $settings->{'indexmap'} = $indexmap;
@@ -352 +353 @@
     }
     # the default level assigned by the user is no longer ignored [Shaoqun], but the retrievel level stays the same. 
-        #if (defined $collectcfg->{"defaultlevel"}) {
-    $default_search_level = $levelmap->{$collectcfg->{"defaultlevel"}};
+    if (defined $collectcfg->{"defaultlevel"}) {
+        $default_search_level = $levelmap->{$collectcfg->{"defaultlevel"}};
         #  $default_retrieve_level = $default_search_level;
-    #}
+    }
     
     if (defined $buildcfg->{'textlevel'}) {
@@ -366 +367 @@
     $settings->{'levelmap'} = $levelmap;
     $settings->{'levellist'} = $levellist;
-    $settings->{'default_search_level'} = $default_search_level;
+    $settings->{'default_search_level'} = $default_search_level if $default_search_level;
     $settings->{'default_retrieve_level'} = $default_retrieve_level;
     $settings->{'default_db_level'} = $default_db_level;
@@ -383 +384 @@
     my $service_type = $settings->{'service_type'};
 
+    # there's no searching and therefore no search services if there are no indexes
+    return if($settings->{'num_indexes'} <= 0);
+    
     # do the search service 
     &write_line('COLCFG', ["<serviceRack name=\"GS2", $service_type, "Search\">"]);
@@ -523 +527 @@
     my ($buildcfg,$settings) = @_;
 
+    #return if($settings->{'num_indexes'} <= 0);    # no search if no indexes
+    
     my $infodbtype   = $settings->{'infodbtype'};
 

main/trunk/greenstone3/web/interfaces/default/transform/layouts/header.xsl

@@ -360 +360 @@
          no search indexes, which is why the extra test for the presence of an index/fq-something is necessary. -->
     <xsl:template name="quick-search-area">
-        <xsl:if test="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@type='query']/paramList/param[@name='index' or starts-with(@name, 'fq')]">
+        <xsl:if test="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@type='query']">
             <xsl:variable name="subaction" select="/page/pageRequest/@subaction"/>
             <div id="quicksearcharea">
+                <xsl:if test="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='TextQuery']">
                 <form action="{$library_name}/collection/{$collNameChecked}/search/TextQuery">
                     <!-- This parameter says that we have come from the quick search area -->
@@ -423 +424 @@
                     <br/>
                     </xsl:if>
+                </form>
+                </xsl:if>
+                
                     <!-- The list of other search types -->
                     <ul>
@@ -436 +440 @@
                         </xsl:for-each>
                     </ul>
-                </form>
             </div>
         </xsl:if>