Changeset 13315

Timestamp:

2006-11-22T17:15:40+13:00 (17 years ago)

Author:

shaoqun

Message:

uses the stardand method to set doc ID and new param list for the read method

File:

• trunk/gsdl/perllib/plugins/DBPlug.pm (modified) (7 diffs)

trunk/gsdl/perllib/plugins/DBPlug.pm

@@ -84 +84 @@
 }
 
-
 sub read {
     my $self = shift (@_);
-    my ($pluginfo, $base_dir, $file, $metadata, $processor, $maxdocs, $total_count, $gli) = @_;
-
-    
-    # see if we can handle the passed file...
-    my ($block_status,$filename) = $self->read_block(@_);    
-    return $block_status if ((!defined $block_status) || ($block_status==0));
+    my ($pluginfo, $base_dir, $file, $metadata, $processor, $maxdocs,$total_count,$gli) = @_;
+        
+     #see if we can handle the passed file...
+     my ($block_status,$filename) = $self->read_block(@_);    
+     return $block_status if ((!defined $block_status) || ($block_status==0));
 
     my $outhandle = $self->{'outhandle'};
@@ -99 +97 @@
     print $outhandle "DBPlug: processing $file\n" 
     if $self->{'verbosity'} > 1;
+   
     require DBI; # database independent stuff
 
     # calculate the document hash, for document ids
-    my $hash="";
-
-    my $osexe = &util::get_os_exe();
-    my $hashfile_exe = &util::filename_cat($ENV{'GSDLHOME'},"bin",
-                       $ENV{'GSDLOS'},"hashfile$osexe");
-    if (-e "$hashfile_exe") {
-    $hash = `hashfile$osexe \"$filename\"`;
-    $hash =~ /:\s*([0-9a-f]+)/i;
-    $hash="HASH$1";
-    }
-
-
+    my $hash="0";
+
+   
     # default options - may be overridden by config file
     my $language=undef;
@@ -133 +123 @@
     my %callbacks=();
 
+
     # read in config file.
     if (!open (CONF, $filename)) {
         print $outhandle "DBPlug: can't read $filename: $!\n";
         return 0;
-    }
+    } 
+   
     my $line;
     my $statement="";
@@ -200 +192 @@
     close CONF;
 
+    
     if (!defined($db)) {
     print $outhandle "DBPlug: error: $filename does not specify a db!\n";
@@ -230 +223 @@
     }
 
+  
     $statement_hand=$dbhandle->prepare($sql_query);
     $statement_hand->execute;
     if ($statement_hand->err) {
-        print $outhandle "Error: " . $statement_hand->errstr . "\n";
+        print $outhandle "Error:" . $statement_hand->errstr . "\n";
     return undef;
     }
@@ -342 +336 @@
     }
 
+
     if (!defined $unique_id) {
-        $doc_obj->set_OID($hash . "s$count");
+             $doc_obj->set_OID();
+             my $id = $doc_obj->get_OID();     
+         $doc_obj->set_OID($id."s$count");
     } else {
         # use our id from the database...
@@ -352 +349 @@
         # process the document
     $processor->process($doc_obj);
-
 
     $count++;