Changeset 33791

Timestamp:

2019-12-11T17:44:56+13:00 (4 years ago)

Author:

ak19

Message:

1. Kathy renamed the gs3interface properties filename from ServiceRack.properties to core_servlet_dictionary.properties; 2. Comitting useful but deactivated debug statements

File:

• main/trunk/greenstone2/bin/script/gti.pl (modified) (3 diffs)

main/trunk/greenstone2/bin/script/gti.pl

@@ -116 +116 @@
 my @gs3_col_cfg_files = ("lucene-jdbm-demo", "solr-jdbm-demo", "localsite");
 
-my @gs3_interface_files = ("interface_default", "ServiceRack", "metadata_names");
+my @gs3_interface_files = ("interface_default", "core_servlet_dictionary", "metadata_names");
 #"AbstractBrowse", "AbstractGS2FieldSearch", "AbstractSearch", "AbstractTextSearch", "Authentication", "CrossCollectionSearch", "GS2LuceneSearch", "LuceneSearch", "MapRetrieve", "MapSearch", "PhindPhraseBrowse", "SharedSoleneGS2FieldSearch");
 
@@ -539 +539 @@
     foreach my $chunk_key (keys(%target_file_key_to_text_mapping)) {
         my $target_file_text = $target_file_key_to_text_mapping{$chunk_key};
+        #&log_message("**** Next chunk to compare search term $query_string to: $target_file_text.");
         if ($target_file_text =~ /$query_string/i) {
             # &log_message("Chunk with key $chunk_key matches query.");
@@ -694 +695 @@
             next;
         }
-        
+        ## DEBUG
+        # if (&unmake_text_xml_safe($source_file_key_to_submission_mapping{$chunk_key}) ne &unmake_text_xml_safe($source_file_key_to_text_mapping{$chunk_key})) {
+                #                 &log_message("**** ORIG SRC: " . &unmake_text_xml_safe($source_file_key_to_text_mapping{$chunk_key}) ."\n");
+                #                 &log_message("**** SUBMIT SRC: " . &unmake_text_xml_safe($source_file_key_to_submission_mapping{$chunk_key}) . "\n");
+        # } else {
+        #     &log_message("unmake-XML-safe versions of source chunk before and for submission match");
+        # }
+        ## END DEBUG
+
         # Make sure the submitted source chunk matches the source file chunk
         if ($source_file_key_to_submission_mapping{$chunk_key} ne $source_file_key_to_text_mapping{$chunk_key}