Changeset 25758 for main/trunk/greenstone2

Timestamp:

2012-06-06T11:24:24+12:00 (12 years ago)

Author:

sjm84

Message:

Some fixes for Solr

Location:

main/trunk/greenstone2

Files:

• bin/script/buildcol.pl (modified) (1 diff)
• perllib/buildConfigxml.pm (modified) (6 diffs)

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

@@ -501 +501 @@
 
     #set the text index
-    if (($buildtype eq "mgpp") || ($buildtype eq "lucene")) {
+    if (($buildtype eq "mgpp") || ($buildtype eq "lucene") || ($buildtype eq "solr")) {
     if ($textindex eq "") {
         $textindex = "text";

main/trunk/greenstone2/perllib/buildConfigxml.pm

@@ -102 +102 @@
     }
 
-    #@ handle indexes - store indexmap (mg) or indexfields and indexfieldmap (mgpp/lucene)
+    #@ handle indexes - store indexmap (mg) or indexfields and indexfieldmap (mgpp/lucene/solr)
     elsif ($element =~ /^indexList$/) {
     # set up the data arrays
@@ -114 +114 @@
     }
     else {
-        # mgpp or lucene
+        # mgpp, lucene or solr
         $indexmap_name = "indexfieldmap";
         $haveindexfields = 1;
@@ -233 +233 @@
     } elsif ($buildtype eq "lucene") {
     $service_type = "Lucene";
+    } elsif ($buildtype eq "solr") {
+    $service_type = "Solr";
     }
     $settings->{'service_type'} = $service_type;
@@ -330 +332 @@
     my $default_db_level = "Doc";
 
-    if ($buildtype eq "mgpp" || $buildtype eq "lucene") {
+    if ($buildtype eq "mgpp" || $buildtype eq "lucene" || $buildtype eq "solr") {
     if (defined $buildcfg->{'levelmap'}) {
         my $first = 1;
@@ -447 +449 @@
     }
     # add in defaultLevel as the same level as indexLevelList, making the reading job easier
-    if ($buildtype eq "lucene" || $buildtype eq "mgpp") {
+    if ($buildtype eq "lucene" || $buildtype eq "mgpp" || $buildtype eq "solr") {
     &write_line('COLCFG', ["<defaultLevel shortname=\"", $default_search_level, "\" />"]);
     }
-    if ($buildtype eq "lucene" || $buildtype eq "mgpp") {
+    if ($buildtype eq "lucene" || $buildtype eq "mgpp" || $buildtype eq "solr") {
         &write_line('COLCFG', ["<defaultDBLevel shortname=\"", $default_db_level, "\" />"]);
     }
     # do searchTypeList
-    if ($buildtype eq "mgpp" || $buildtype eq "lucene") {
+    if ($buildtype eq "mgpp" || $buildtype eq "lucene" || $buildtype eq "solr") {
       &write_line('COLCFG', ["<searchTypeList>"]);
       
@@ -568 +570 @@
       &write_line('COLCFG', ["<indexStem name=\"", $indexstem, "\" />"]);     
     }
-    if ($buildtype eq "mgpp" || $buildtype eq "lucene") {
+    if ($buildtype eq "mgpp" || $buildtype eq "lucene" || $buildtype eq "solr") {
     my $default_retrieve_level = $settings->{'default_retrieve_level'};
       &write_line('COLCFG', ["<defaultLevel shortname=\"", $default_retrieve_level, "\" />"]);