From a0e8b599003e7efe13192da07156371d317706f9 Mon Sep 17 00:00:00 2001 From: nruest Date: Thu, 19 Jul 2012 12:20:59 -0400 Subject: [PATCH] ready to test --- plugins/fits.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/fits.inc b/plugins/fits.inc index 1de5a559..abc9074f 100644 --- a/plugins/fits.inc +++ b/plugins/fits.inc @@ -38,7 +38,7 @@ class fits { $file_suffix = '_' . $dsid . '.xml'; $returnValue = TRUE; $output = array(); - exec('fits ' . escapeshellarg($file) . '', $output); + exec('fits.sh -h' . escapeshellarg($file) . '', $output); file_put_contents($file . $file_suffix, implode("\n", $output)); $_SESSION['fedora_ingest_files']["$dsid"] = $file . $file_suffix; return TRUE; @@ -50,11 +50,11 @@ class fits { */ function displayMetadata() { $output = ''; - $exif = $this->item->get_datastream_dissemination('FITS'); - if (trim($exif) != '') { - $exifDom = DOMDocument::loadXML($this->item->get_datastream_dissemination('FITS')); - if ($exifDom != NULL) { - $description = $exifDom->getElementsByTagNameNS('http://www.w3.org/1999/02/22-rdf-syntax-ns#', 'Description'); + $fits = $this->item->get_datastream_dissemination('FITS'); + if (trim($fits) != '') { + $fitsDom = DOMDocument::loadXML($this->item->get_datastream_dissemination('FITS')); + if ($fitsDom != NULL) { + $description = $fitsDom->getElementsByTagNameNS('http://hul.harvard.edu/ois/xml/ns/fits/fits_output', 'fits'); if ($description->length > 0) { $description = $description->item(0); $output .= '