Changeset 31617 for main/trunk

Timestamp:

2017-04-20T20:31:54+12:00 (7 years ago)

Author:

ak19

Message:

Removing the debugging.

Location:

main/trunk/greenstone2/perllib/cgiactions

Files:

• metadataaction.pm (modified) (4 diffs)
• modmetadataaction.pm (modified) (4 diffs)

main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm

@@ -35 +35 @@
 use JSON;
 
+# This class is conditionally expanded with set-metadata, remove-metadata and insert-metadata subroutines
+# defined in modmetadataaction.pm. The BEGIN code block determines whether the condition holds.
+# See
 # http://stackoverflow.com/questions/3998619/what-is-the-role-of-the-begin-block-in-perl
 # http://www.perlmonks.org/?node_id=881761 - splitting module into multiple files
@@ -52 +55 @@
 
     if(!defined $ENV{'GSDL3HOME'} || (defined $ENV{'GS3_AUTHENTICATED'} && $ENV{'GS3_AUTHENTICATED'} eq "true")) {
-    print STDERR "\nIncluding modmeta...\n";
     require modmetadataaction;
     }
@@ -58 +60 @@
     $modmeta_action_table = {};
     }
-    print STDERR "End of metadata::BEGIN\n\n";
 }
 
@@ -95 +96 @@
 };
 
-print STDERR "\nMODMETA_TABLE 2: " .join(",", keys $metadataaction::modmeta_action_table) ."\n";
-
-
-# merge the hashes - http://www.perlmonks.org/?node_id=524456
+# To get the final action_table of all available subroutines in this class,
+# merge the get- and mod-metadata hashes. See http://www.perlmonks.org/?node_id=524456
+# Note that modmeta_action_table will be empty of subroutines if the user does not have permissions
+# to modify metadata.
 my $action_table = { %$getmeta_action_table, %$modmeta_action_table };
 

main/trunk/greenstone2/perllib/cgiactions/modmetadataaction.pm

@@ -32 +32 @@
 # and how variables declared with 'our' are used there.
 
-# http://stackoverflow.com/questions/3998619/what-is-the-role-of-the-begin-block-in-perl
-# http://www.perlmonks.org/?node_id=881761 - splitting module into multiple files
-# http://www.perlmonks.org/?node_id=524456 - merging hashes
-
 package metadataaction;
 
@@ -46 +42 @@
 
 use JSON;
-
-
-BEGIN {
-    print STDERR "In ModMeta\n";
-}
 
 
@@ -134 +125 @@
         'optional-args'   => [ ] }
 };
-
-print STDERR "\nMODMETA_TABLE: " .join(",", keys $metadataaction::modmeta_action_table) ."\n";
 
 
@@ -2670 +2659 @@
 
 # not returning 1; here since this file is conditionally included by metadataction.pm
+# and not otherwise meant to be used on its own
+