Changeset 19052 for gsdl/trunk/perllib

Timestamp:

2009-04-19T19:26:14+12:00 (15 years ago)

Author:

davidb

Message:

Modifications to CONENTdmPlugin so its works with Kathy's new plugin restructuring. Still considered experimental.

File:

• gsdl/trunk/perllib/plugins/CONTENTdmPlugin.pm (modified) (13 diffs)

gsdl/trunk/perllib/plugins/CONTENTdmPlugin.pm

@@ -108 +108 @@
 
     my $parser = new XML::Parser('Style' => 'Stream',
-                 'Pkg' => 'CONTENTdmPlugin',
+                 'Pkg' => 'ReadXMLFile',
                  'PluginObj' => $self,
-                 'Handlers' => {'Char' => \&Char,
-                        'XMLDecl' => \&XMLDecl,
-                        'Entity' => \&Entity,
-                        'Doctype' => \&Doctype,
-                        'Default' => \&Default
+                 'Handlers' => {'Char' => \&ReadXMLFile::Char,
+                        'XMLDecl' => \&ReadXMLFile::XMLDecl,
+                        'Entity'  => \&ReadXMLFile::Entity,
+                        'Doctype' => \&ReadXMLFile::Doctype,
+                        'Default' => \&ReadXMLFile::Default
                         });  
     $self->{'parser'} = $parser;
+
+
     $self->{'rdf_desc'} = undef;
     $self->{'about_key'} = undef;
@@ -134 +136 @@
 
     $self = bless $self, $class;
+
+# ***** no longer needed!
+#    # This needs to be done after blss, to $self passed to XML::Parser
+#    # can correctly resolve the right call-back methods during XML parsing
+
+
     $self->load_secondary_plugins($class,$secondary_plugin_options,$hashArgOptLists);
     return $self;
@@ -232 +240 @@
     = &File::Basename::fileparse($txt_filename, "\\.[^\\.]+\$");
 
-    my $txt_file = "$tailname.$suffix";
+    my $txt_file = "$tailname$suffix";
 
     return $txt_file;
@@ -384 +392 @@
         my $transformed_xml = $self->apply_xslt($xslt,$input_filename);
 
+        open(TOUT,">/tmp/tout.xml") 
+        || die "Unable to open /tmp/tout.xml: $!\n";
+        print TOUT $transformed_xml;
+        close(TOUT);
+
+
         # feed transformed file (now in memory as string) into XML parser
         $self->{'parser'}->parse($transformed_xml);
@@ -513 +527 @@
     my $fakeimg_tmp_filename = &util::filename_cat($tmp_dirname, "empty.jpg");
 
-    print STDERR "***** Setting up fake filename $fakeimg_filename -> $fakeimg_tmp_filename\n";
+    print STDERR "***** No source image identified with item\n";
+
+    print STDERR "***** Using default \"no image available\" $fakeimg_filename -> $fakeimg_tmp_filename\n";
 
     &util::soft_link($fakeimg_filename, $fakeimg_tmp_filename);
@@ -565 +581 @@
     my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $processor, $maxdocs, $total_count, $gli) = @_;
 
+
     $self->{'gli'} = $gli;
     $self->{'file'} = $file;
@@ -576 +593 @@
 
     $file =~ s/^[\/\\]+//; # $file often begins with / so we'll tidy it up
-       
+
     # read() deviates at this point from ConvertBinaryFile
     # Need to work with list of filename returned
@@ -584 +601 @@
 
     $conv_filename_list = $self->tmp_area_convert_file($output_ext, $filename_full_path);
-    
+
     if (scalar(@$conv_filename_list)==0) {
     return -1;
@@ -610 +627 @@
     
     my $secondary_plugin = $secondary_plugins->{$plugin_name};
-    
+
     # note: metadata is not carried on to the next level
     my ($rv,$doc_obj) 
@@ -616 +633 @@
                             $block_hash, $metadata, $processor, $maxdocs, $total_count,
                             $gli);
+
+    print STDERR "**** $conv_filename => returned rv = $rv\n";
 
     if ((defined $rv) && ($rv>=0)) {
@@ -638 +657 @@
     # do plugin specific processing of doc_obj
     unless (defined ($self->process(undef, $pluginfo, $base_dir, $file, $metadata, $doc_obj, $gli))) {
+        print STDERR "***** process returned undef: $base_dir $file\n";
         print STDERR "<ProcessingError n='$file'>\n" if ($gli);
         return -1;
@@ -660 +680 @@
 sub process {
 
-}
+    return 1;
+}
+
 # do we need this? sec pluginn process would have already been called as part of read_into_doc_obj??
 sub process_old {
@@ -781 +803 @@
     my $self = shift(@_);
     my ($expat) = @_;
-
 }