Changeset 8716 for trunk/gsdl/perllib/doc.pm

Timestamp:

2004-12-01T16:14:11+13:00 (19 years ago)

Author:

kjdon

Message:

added some changes made by Emanuel Dejanu (Simple Words)

File:

• trunk/gsdl/perllib/doc.pm (modified) (11 diffs)

trunk/gsdl/perllib/doc.pm

@@ -95 +95 @@
     my $newobj = {};
     
-    foreach $k (keys %$self) {
+    foreach my $k (keys %$self) {
     $newobj->{$k} = &clone ($self->{$k});
     }
@@ -109 +109 @@
     if ($type eq "HASH") {
     my $to = {};
-    foreach $key (keys %$from) {
+    foreach my $key (keys %$from) {
         $to->{$key} = &clone ($from->{$key});
     }
@@ -115 +115 @@
     } elsif ($type eq "ARRAY") {
     my $to = [];
-    foreach $v (@$from) {
+    foreach my $v (@$from) {
         push (@$to, &clone ($v));
     }
@@ -128 +128 @@
     my ($type) = @_;
 
-    if ($type eq "incremental") {
+    if ($type =~ /^(hash|incremental|dirname)$/) {
     $self->{'OIDtype'} = $type;
     } else {
@@ -638 +638 @@
         $OID = "D" . $OIDcount;
         $OIDcount ++;
+      
+    } elsif ($self->{'OIDtype'} eq "dirname") {
+        $OID = 'J';
+        my $filename = $self->get_source_filename();
+        if (defined($filename) && -e $filename) {
+        $OID = &File::Basename::dirname($filename);
+        if (defined $OID) {
+            $OID = 'J'.&File::Basename::basename($OID);
+        } else {
+            print STDERR "Failed to find base for filename ($filename).....\n";
+            die("\n");  
+        }
+        } else {
+        print STDERR "Failed to find filename.....\n";
+        die("\n");
+        }    
         
     } else {
@@ -1002 +1018 @@
     my $section_ptr = $self->_lookup_section($section);
     if (!defined $section_ptr) {
-    print STDERR "doc::get_metadata_element couldn't find section " .
-        "$section\n";
+    print STDERR "doc::get_metadata_element couldn't find section ", $section, "\n";
     return;
     }
@@ -1036 +1051 @@
     my $section_ptr = $self->_lookup_section($section);
     if (!defined $section_ptr) {
-        print STDERR "doc::get_metadata couldn't find section " .
-            "$section\n";
+        print STDERR "doc::get_metadata couldn't find section ",
+        $section, "\n";
         return;
     }
@@ -1068 +1083 @@
     my $section_ptr = $self->_lookup_section($section);
     if (!defined $section_ptr) {
-    print STDERR "doc::get_all_metadata couldn't find section " .
-        "$section\n";
+    print STDERR "doc::get_all_metadata couldn't find section ", $section, "\n";
     return;
     }
@@ -1083 +1097 @@
     my $section_ptr = $self->_lookup_section($section);
     if (!defined $section_ptr) {
-    print STDERR "doc::delete_metadata couldn't find section " .
-        "$section\n";
+    print STDERR "doc::delete_metadata couldn't find section ", $section, "\n";
     return;
     }
@@ -1105 +1118 @@
     my $section_ptr = $self->_lookup_section($section);
     if (!defined $section_ptr) {
-    print STDERR "doc::delete_all_metadata couldn't find section " .
-        "$section\n";
+    print STDERR "doc::delete_all_metadata couldn't find section ", $section, "\n";
     return;
     }
@@ -1149 +1161 @@
     my $section_ptr = $self->_lookup_section($section);
     if (!defined $section_ptr) {
-    print STDERR "doc::add_utf8_metadata couldn't find section " .
-        "$section\n";
+    print STDERR "doc::add_utf8_metadata couldn't find section ", $section, "\n";
     return;
     }