Changeset 8797 for trunk/gsdl/perllib/doc.pm
- Timestamp:
- 2004-12-14T14:08:32+13:00 (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl/perllib/doc.pm
r8716 r8797 128 128 my ($type) = @_; 129 129 130 if ($type =~ /^(hash|incremental|dirname )$/) {130 if ($type =~ /^(hash|incremental|dirname|assigned)$/) { 131 131 $self->{'OIDtype'} = $type; 132 132 } else { … … 631 631 my ($OID) = @_; 632 632 633 my $use_hash_oid = 0; 633 634 # if an OID wasn't provided claculate one 634 635 if (!defined $OID) { 635 636 $OID = "NULL"; 636 637 if ($self->{'OIDtype'} eq "incremental") { 637 if ($self->{'OIDtype'} eq "hash") { 638 $use_hash_oid = 1; 639 } elsif ($self->{'OIDtype'} eq "incremental") { 638 640 $OID = "D" . $OIDcount; 639 641 $OIDcount ++; … … 642 644 $OID = 'J'; 643 645 my $filename = $self->get_source_filename(); 644 if (defined($filename) && -e $filename) {646 if (defined($filename)) { # && -e $filename) { 645 647 $OID = &File::Basename::dirname($filename); 646 648 if (defined $OID) { 647 649 $OID = 'J'.&File::Basename::basename($OID); 650 $OID =~ s/\.//; #remove any periods 648 651 } else { 649 print STDERR "Failed to find base for filename ($filename)... ..\n";650 die("\n");652 print STDERR "Failed to find base for filename ($filename)...generating hash id\n"; 653 $use_hash_oid = 1; 651 654 } 652 655 } else { 653 print STDERR "Failed to find filename .....\n";654 die("\n");656 print STDERR "Failed to find filename, generating hash id\n"; 657 $use_hash_oid = 1; 655 658 } 656 659 660 } elsif ($self->{'OIDtype'} eq "assigned") { 661 my $identifier = $self->get_metadata_element ($self->get_top_section(), "dc.Identifier"); 662 if (defined $identifier && $identifier ne "") { 663 $OID = "D" . $self->get_metadata_element ($self->get_top_section(), "dc.Identifier"); 664 $OID =~ s/\.//; #remove any periods 665 } else { 666 # need a hash id 667 print STDERR "no dc.Identifier found, generating hash id\n"; 668 $use_hash_oid = 1; 669 } 670 657 671 } else { 672 $use_hash_oid = 1; 673 } 674 675 if ($use_hash_oid) { 676 658 677 # "hash" OID - feed file to hashfile.exe 659 678 #my $filename = $self->get_source_filename();
Note:
See TracChangeset
for help on using the changeset viewer.