Changeset 10923 for trunk/gsdl

Timestamp:

2005-11-23T12:15:42+13:00 (18 years ago)

Author:

jrm21

Message:

1) allow a 2nd sql query for 'priming' the db
2) add a space when concatenating multiple lines in config file
3) don't add metadata if the field data was NULL

File:

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

trunk/gsdl/perllib/plugins/DBPlug.pm

@@ -127 +127 @@
 # then get pagename from "page" and content from "version" !
 
+    my $sql_query_prime = undef ;
     my $sql_query = undef ;
 
@@ -142 +143 @@
     while (defined($line=<CONF>)) {
     chomp $line;
+    $line .= " "; # for multi-line statements - don't conjoin!
     $line =~ s/\s*\#.*$//mg; # remove comments
     $statement .= $line;
@@ -210 +212 @@
     }
 
-    my $statement_hand=$dbhandle->prepare($sql_query);
+    my $statement_hand;
+
+    # The user gave 2 sql statements to execute?
+    if ($sql_query_prime) {
+        $statement_hand=$dbhandle->prepare($sql_query_prime);
+        $statement_hand->execute;
+        if ($statement_hand->err) {
+            print $outhandle "Error: " . $statement_hand->errstr . "\n";
+            return undef;
+        }
+    }
+
+    $statement_hand=$dbhandle->prepare($sql_query);
     $statement_hand->execute;
+    if ($statement_hand->err) {
+        print $outhandle "Error: " . $statement_hand->errstr . "\n";
+    return undef;
+    }
 
     # get the array-ref for the field names and cast it to array
@@ -228 +246 @@
     }
 
-#    print "DBPlug: names: " . join (", ", @field_names) . ".\n";
     # get rows
 
@@ -278 +295 @@
     foreach my $fieldname (@field_names) {
         my $fielddata=shift @row_array;
+
+        if (! defined($fielddata) ) {
+            next; # this field was "" or NULL
+        }
         # use the specified encoding, defaulting to utf-8
         if (defined($encoding) && $encoding ne "ascii"