Skip to content
Snippets Groups Projects
Commit 9fb88c5c authored by Andreas Romeyke's avatar Andreas Romeyke
Browse files

- refactoring, use array-references instead arrays

- fixed filepaths
parent 0f9b9b0d
Branches
No related tags found
No related merge requests found
...@@ -285,12 +285,12 @@ sub check_if_db_conform ($$) { ...@@ -285,12 +285,12 @@ sub check_if_db_conform ($$) {
return $title; return $title;
} }
sub get_dcrecords { sub get_dcrecords_ref {
my $xp = shift; my $xp = shift;
my $filename = shift; my $filename = shift;
my @dcrecords; my @dcrecords;
my $dcnodes = $xp->find($compiled_xpath_dcrecords); my @dcnodes = $xp->findnodes($compiled_xpath_dcrecords);
foreach my $dcnode ($dcnodes->get_nodelist) { foreach my $dcnode (@dcnodes) {
#my $ref = ref $dcnode; use Data::Printer; p( $ref); #my $ref = ref $dcnode; use Data::Printer; p( $ref);
my $key = $dcnode->getName(); my $key = $dcnode->getName();
#my $value = $dcnode->findvalue($compiled_xpath_dot); #my $value = $dcnode->findvalue($compiled_xpath_dot);
...@@ -305,7 +305,7 @@ sub check_if_db_conform ($$) { ...@@ -305,7 +305,7 @@ sub check_if_db_conform ($$) {
push @dcrecords, \@pair; push @dcrecords, \@pair;
} }
} }
return @dcrecords; return \@dcrecords;
} }
sub get_repid { sub get_repid {
...@@ -324,14 +324,13 @@ sub check_if_db_conform ($$) { ...@@ -324,14 +324,13 @@ sub check_if_db_conform ($$) {
return $repid; return $repid;
} }
sub get_files { sub get_files_ref {
my $xp = shift; my $xp = shift;
my $filename = shift; my $filename = shift;
my $repid = shift; my $repid = shift;
my @files_nodes = $xp->findnodes("mets:mets/mets:fileSec/mets:fileGrp[\@ADMID='$repid']/mets:file/mets:FLocat/\@xlin:href");
my $files_nodes = $xp->find("mets:mets/mets:fileSec/mets:fileGrp[\@ADMID='$repid']/mets:file/mets:FLocat/\@xlin:href"); my @files = map {s#//#/#g; $_} map { $_->nodeValue } @files_nodes;
my @files = map { $_->nodeValue} $files_nodes->get_nodelist(); return \@files;
return @files;
} }
sub parse_iexml($$) { sub parse_iexml($$) {
...@@ -354,7 +353,7 @@ sub check_if_db_conform ($$) { ...@@ -354,7 +353,7 @@ sub check_if_db_conform ($$) {
my $title = get_title($xp, $filename); my $title = get_title($xp, $filename);
############################################ ############################################
# get dc-records # get dc-records
my @dcrecords = get_dcrecords($xp, $filename); my $dcrecords_ref = get_dcrecords_ref($xp, $filename);
############################################ ############################################
# get right representation ID (has a dnx-section with <key id=label>LOCAL</key>) # get right representation ID (has a dnx-section with <key id=label>LOCAL</key>)
my $repid = get_repid($xp, $filename); my $repid = get_repid($xp, $filename);
...@@ -367,13 +366,13 @@ sub check_if_db_conform ($$) { ...@@ -367,13 +366,13 @@ sub check_if_db_conform ($$) {
} }
############################################ ############################################
# get all files of LOCAL representation # get all files of LOCAL representation
my @files = get_files ($xp, $filename, $repid); my $files_ref = get_files_ref ($xp, $filename, $repid);
my %ret; my %ret;
$ret{"filename" } = $filename; $ret{"filename" } = $filename;
$ret{"title"} = $title; $ret{"title"} = $title;
$ret{"repid"} = $repid; $ret{"repid"} = $repid;
$ret{"files"} = \@files; $ret{"files"} = $files_ref;
$ret{"dcrecords"} = \@dcrecords; $ret{"dcrecords"} = $dcrecords_ref;
return \%ret; return \%ret;
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment