Changeset 24643 for gs3-extensions/solr

Timestamp:

2011-09-25T23:26:49+13:00 (13 years ago)

Author:

davidb

Message:

Adjustments to code as a result of testing

Location:

gs3-extensions/solr/trunk/src/perllib

Files:

• solrbuilder.pm (modified) (4 diffs)
• solrserver.pm (modified) (1 diff)

gs3-extensions/solr/trunk/src/perllib/solrbuilder.pm

@@ -236 +236 @@
     $schema_insert_xml .= "    "; # indent
     $schema_insert_xml .= "<field name=\"$field\" ";
-    $schema_insert_xml .=   "type=\"string\" indexed=\"true\" ";
+    $schema_insert_xml .=   "type=\"text_en_splitting\" indexed=\"true\" ";
     $schema_insert_xml .=   "stored=\"false\" multiValued=\"true\" />\n"; 
     }
@@ -249 +249 @@
     my $in_dirname = &util::filename_cat($solr_home,"conf");
     my $schema_in_filename = &util::filename_cat($in_dirname,"schema.xml.in");
-
 
     my $collect_home = $ENV{'GSDLCOLLECTDIR'};
@@ -384 +383 @@
     my $core = "$core_prefix-$index_dir";
 
+    # force_removeold == opposite of being run in 'incremental' mode
     my $force_removeold = ($self->{'incremental'}) ? 0 : 1;
+
     if ($force_removeold) {
         print $outhandle "\n-removeold set (new index will be created)\n";
@@ -391 +392 @@
         &util::rm_r($full_index_dir);
         &util::mk_dir($full_index_dir);
-    }
-
-    # if collect==core already in solr.xml (check with STATUS)
-    # => use RELOAD call to refresh fields now expressed in schema.xml
-    #
-    # else 
-    # => use CREATE API to add to solr.xml
-        
-    my $check_core_exists = $solr_server->admin_ping_core($core);
-       
-    if ($check_core_exists) {       
-        print $outhandle "Reloading Solr core: $core\n";
-        $solr_server->admin_reload_core($core);
-    }
-    else {
+
+        # Solr then wants an "index" folder within this general index area!
+#       my $full_index_index_dir = &util::filename_cat($full_index_dir,"index");
+#       &util::mk_dir($full_index_index_dir);
+
+
+        # now go on and create new index
         print $outhandle "Creating Solr core: $core\n";
         $solr_server->admin_create_core($core);
+
+    }
+    else {
+        # if collect==core already in solr.xml (check with STATUS)
+        # => use RELOAD call to refresh fields now expressed in schema.xml
+        #
+        # else 
+        # => use CREATE API to add to solr.xml
+        
+        my $check_core_exists = $solr_server->admin_ping_core($core);
+       
+        if ($check_core_exists) {       
+        print $outhandle "Reloading Solr core: $core\n";
+        $solr_server->admin_reload_core($core);
+        }
+        else {
+        print $outhandle "Creating Solr core: $core\n";
+        $solr_server->admin_create_core($core);
+        }
     }
     }

gs3-extensions/solr/trunk/src/perllib/solrserver.pm

@@ -115 +115 @@
     }
 
-    my $output = { 'preamble' => $preamble_output,
+    my $output = { 'url'      => $full_url,
+           'preamble' => $preamble_output,
            'output'   => $xml_output,
            'error'    => $error_output };