Author: sevein
Date: Tue Nov 1 15:07:43 2011
New Revision: 10240
Log:
Handle nested dirs correctly, ignore zip notices just halt on errors
Modified:
trunk/plugins/qtSwordPlugin/lib/qtPackageExtractorMETSArchivematicaDIP.class.php
Modified:
trunk/plugins/qtSwordPlugin/lib/qtPackageExtractorMETSArchivematicaDIP.class.php
==============================================================================
---
trunk/plugins/qtSwordPlugin/lib/qtPackageExtractorMETSArchivematicaDIP.class.php
Tue Nov 1 11:49:22 2011 (r10239)
+++
trunk/plugins/qtSwordPlugin/lib/qtPackageExtractorMETSArchivematicaDIP.class.php
Tue Nov 1 15:07:43 2011 (r10240)
@@ -144,10 +144,14 @@
$this->directory = $this->filename.'_dir';
$command = vsprintf('unzip -d %s %s', array($this->directory,
$this->filename));
exec($command, $output, $return);
- if (0 == $return)
+ if (2 > $return)
{
$this->document = @file_get_contents($this->directory.'/METS.xml');
}
+ else
+ {
+ // throw?
+ }
break;
}
@@ -276,7 +280,7 @@
if (is_dir($dir.'/'.$file))
{
$dir2 = $dir.'/'.$file;
- $files[] = $this->getFilesFromDirectory($dir2);
+ $files = $files + $this->getFilesFromDirectory($dir2);
}
else
{
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
