Changeset 24483 for gs3-extensions/solr/trunk/src/perllib/solrbuilder.pm

Timestamp:

2011-08-26T00:22:29+12:00 (13 years ago)

Author:

davidb

Message:

Reworking of code that detects existing running instance of Solr/Jetty server. This was due to Windows version of Perl not implementing '' on an open call. Code currently messy and needs a further tidy up.

File:

• gs3-extensions/solr/trunk/src/perllib/solrbuilder.pm (modified) (5 diffs)

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

@@ -117 +117 @@
         print STDERR "Sections:      $solr_passes_sections\n";
         print STDERR "Build Dir:     $build_dir\n";
-        print STDERR "Cmd:           $solr_passes_exe $collection text $solr_passes_sections \"$build_dir\" \"dummy\"   $osextra\n";
-    if (!open($handle, "| $solr_passes_exe $collection text $solr_passes_sections \"$build_dir\" \"dummy\"   $osextra"))
+        print STDERR "Cmd:           $solr_passes_exe $collection text dummy \"$build_dir\" \"dummy\"   $osextra\n";
+    if (!open($handle, "| $solr_passes_exe $collection text dummy \"$build_dir\" \"dummy\"   $osextra"))
     {
         print STDERR "<FatalError name='NoRunSolrPasses'/>\n</Stage>\n" if $self->{'gli'};
@@ -272 +272 @@
 
 
-sub solr_core_admin
-{
-    my $self = shift (@_);
-    my ($url) = @_;
-
-    my $cmd = "wget -O - \"$url\" 2>&1";
-
-    my $preamble_output = "";    
-    my $xml_output = "";
-    my $error_output = undef;
-
-    my $in_preamble = 1;
-    
-    if (open(WIN,"$cmd |")) {
-
-    my $line;
-    while (defined ($line=<WIN>)) {
-
-        if ($line =~ m/ERROR \d+:/) {
-        chomp $line;
-        $error_output = $line;
-        last;
-        }
-        elsif ($in_preamble) {
-        if ($line =~ m/<.*>/) {
-            $in_preamble = 0;
-        }
-        else {
-            $preamble_output .= $line;
-        }
-        }
-
-        if (!$in_preamble) {
-        $xml_output .= $line;
-        }
-    }
-    close(WIN);
-
-    }
-    else {
-    $error_output = "Error: failed to run $cmd\n";
-    $error_output .= "  $!\n";
-    }
-
-    my $output = { 'preamble' => $preamble_output,
-           'output'   => $xml_output,
-           'error'    => $error_output };
-
-    return $output;
-}
-
 sub pre_build_indexes
 {
@@ -415 +364 @@
     # => at most two cores <colname>-Doc and <colname>-Sec
 
-    my $jetty_server_port = $ENV{'SOLR_JETTY_PORT'};
-    my $base_url = "http://localhost:$jetty_server_port/solr/admin/cores";
-
     my $collection = $self->{'collection'};
 
@@ -427 +373 @@
     my ($pindex) = $level =~ /^(.)/;
     
-    my $llevel = $mgppbuilder::level_map{$level};
-    my $core = $collection."-".lc($llevel);
-    
-    
-    # if collect==core not already in solr.xml (check with STATUS)
-    # => use CREATE API to add to solr.xml
+##  my $llevel = $mgppbuilder::level_map{$level};
+##  my $core = $collection."-".lc($llevel);
+        
+    my $core = $collection."-".$pindex.$idx;
+
+    # if collect==core already in solr.xml (check with STATUS)
+    # => use RELOAD call to refresh fields now expressed in schema.xml
     #
     # else 
-    # => use RELOAD call to refresh fields now expressed in schema.xml
-    
-    
-    my $check_core_url    = "$base_url?action=STATUS&core=$core";
-    my $output = $self->solr_core_admin($check_core_url);
-
-    if (defined $output->{'error'}) {
-
-        my $preamble = $output->{'preamble'};
-        my $error    = $output->{'error'};
-
-        print STDERR "----\n";
-        print STDERR "Error: Failed to get XML response from:\n";
-        print STDERR "         $check_core_url\n";
-        print STDERR "Output was:\n";
-        print STDERR $preamble if ($preamble ne "");
-        print STDERR "$error\n";
-        print STDERR "----\n";
-
-        next;
-    }
-    
-    # If the collection doesn't exist yet, then there will be
-    # an empty element of the form:
-    #   <lst name="collect-doc"/>
-    # where 'collect' is the actual name of the collection, 
-    # such as demo
-
-    my $xml_output = $output->{'output'};
-    
-    my $empty_element="<lst\\s+name=\"$core\"\\s*\\/>";
-    
-    my $check_core_exists = !($xml_output =~ m/$empty_element/s);
-    
-    if ($check_core_exists) {
-        
-        my $reload_core_url    = "$base_url?action=RELOAD&core=$core";
-        
+    # => 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";
-        $self->solr_core_admin($reload_core_url);
+        $solr_server->admin_reload_core($core);
     }
     else {
-        
-        my $collect_home = $ENV{'GSDLCOLLECTDIR'};
-        my $etc_dirname = &util::filename_cat($collect_home,"etc");
-        
-        my $build_dir = $self->{'build_dir'};
-        my $idx_dirname = &util::filename_cat($build_dir,$pindex.$idx);
-        
-        my $create_core_url    = "$base_url?action=CREATE&name=$core";
-        $create_core_url .= "&instanceDir=$etc_dirname";
-        $create_core_url .= "&dataDir=$idx_dirname";
-        
         print $outhandle "Creating Solr core: $core\n";
-        $self->solr_core_admin($create_core_url);
+        $solr_server->admin_create_core($core);
     }
     }
@@ -574 +477 @@
     } else {
     my $collection = $self->{'collection'};
-
-    print STDERR "Cmd: $solr_passes_exe $opt_create_index $collection index $solr_passes_sections \"$build_dir\" \"$indexdir\"   $osextra\n";
-    if (!open($handle, "| $solr_passes_exe $opt_create_index $collection index $solr_passes_sections \"$build_dir\" \"$indexdir\"   $osextra")) {
+    my $ds_idx = $self->{'index_mapping'}->{$index};
+
+    print STDERR "Cmd: $solr_passes_exe $opt_create_index $collection index $ds_idx \"$build_dir\" \"$indexdir\"   $osextra\n";
+    if (!open($handle, "| $solr_passes_exe $opt_create_index $collection index $ds_idx \"$build_dir\" \"$indexdir\"   $osextra")) {
         print STDERR "<FatalError name='NoRunSolrPasses'/>\n</Stage>\n" if $self->{'gli'};
         die "solrbuilder::build_index - couldn't run $solr_passes_exe\n!$\n";