Changeset 31218 for main/trunk/greenstone2

Timestamp:

2016-12-12T19:45:39+13:00 (7 years ago)

Author:

ak19

Message:

Changes to get new perl code to work on the Mac Mountain Lion.

File:

• main/trunk/greenstone2/perllib/oaiinfo.pm (modified) (8 diffs)

main/trunk/greenstone2/perllib/oaiinfo.pm

@@ -236 +236 @@
     # all the while ensuring all PDs are changed back to E for OIDs that exist in both arcinfo and oaiinfo db.  
 
-    foreach my $OID (keys $archive_info->{'info'}) {
+    my $arcinfo_map = $archive_info->{'info'};
+
+    foreach my $OID (keys %$arcinfo_map) {
     my $arcinf_tuple = $archive_info->{'info'}->{$OID};
     my $indexing_status = $arcinf_tuple->[arcinfo::INFO_STATUS_INDEX];
@@ -306 +308 @@
     print STDERR "@@@@@ oaiinfo::mark_all_E_as_PD(): Marking the E entries as PD\n";
 
-    foreach my $OID (keys $self->{'info'}) {
+    my $infomap = $self->{'info'};
+
+    foreach my $OID (keys %$infomap) { # Mac Mountain Lion wants %$map, won't accept %$self->{'info'}
     my $OID_info = $self->{'info'}->{$OID};
     my $curr_status = $OID_info->[INFO_STATUS_INDEX];
@@ -322 +326 @@
     print STDERR "@@@@@ oaiinfo::mark_all_PD_as_D(): Marking the PD entries as D\n";
 
-    foreach my $OID (keys $self->{'info'}) {
+    my $infomap = $self->{'info'};
+
+    foreach my $OID (keys %$infomap) {
     my $OID_info = $self->{'info'}->{$OID};
     my $curr_status = $OID_info->[INFO_STATUS_INDEX];
@@ -340 +346 @@
     print STDERR "@@@@@ oaiinfo::print_info(): oaidb in memory contains: \n";
     
-    foreach my $OID (keys $self->{'info'}) {
+    my $infomap = $self->{'info'};
+
+    foreach my $OID (keys %$infomap) {
     print STDERR "OID: $OID";
     print STDERR " status: " . $self->{'info'}->{$OID}->[INFO_STATUS_INDEX];
@@ -460 +468 @@
     &dbutil::read_infodb_file($self->{'infodbtype'}, $filename, $infodb_map);
 
-    foreach my $oid ( keys $infodb_map ) {
+    foreach my $oid ( keys %$infodb_map ) {
     my $vals = $infodb_map->{$oid};
     # interested in oid, timestamp, deletion status
@@ -522 +530 @@
     # Then write out data structure $self->{'info'} that's been maintaining the data in-memory. 
     my $infodb_handle = &dbutil::open_infodb_write_handle($infodbtype, $filename);
-    foreach my $oid ( keys $self->{'info'} ) {
+
+    my $infomap = $self->{'info'};
+    foreach my $oid ( keys %$infomap ) {
     my $OID_info = $self->{'info'}->{$oid};
     my $val = "<status>".$OID_info->[INFO_STATUS_INDEX];
@@ -576 +586 @@
 
     my @list = ();
-
-    foreach my $OID (keys $self->{'info'}) {    
+    
+    my $infomap = $self->{'info'};
+    foreach my $OID (keys %$infomap) {  
     my $OID_info = $self->{'info'}->{$OID};
 
@@ -594 +605 @@
 sub size {
     my $self = shift (@_);
-    return (scalar keys $self->{'info'});
+    my $infomap = $self->{'info'};
+    return (scalar keys %$infomap);
 }