*6739* Minor tune-ups to related native import/export plugin

cjuergen · Jul 6, 2011 · 6f3cc0c · 6f3cc0c
1 parent 40ce98d
commit 6f3cc0c
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 21 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "lib/pkp"]
 	path = lib/pkp
 	url = [email protected]:pkp/pkp-lib.git
+[submodule "plugins/importexport/duracloud/lib/DuraCloud-PHP"]
+	path = plugins/importexport/duracloud/lib/DuraCloud-PHP
+	url = [email protected]:asmecher/DuraCloud-PHP
diff --git a/plugins/importexport/duracloud/lib/DuraCloud-PHP b/plugins/importexport/duracloud/lib/DuraCloud-PHP
diff --git a/plugins/importexport/native/NativeImportExportPlugin.inc.php b/plugins/importexport/native/NativeImportExportPlugin.inc.php
@@ -58,23 +58,23 @@ function display(&$args, $request) {
 
 		$issueDao =& DAORegistry::getDAO('IssueDAO');
 
-		$journal =& Request::getJournal();
+		$journal =& $request->getJournal();
 		switch (array_shift($args)) {
 			case 'exportIssues':
-				$issueIds = Request::getUserVar('issueId');
+				$issueIds = $request->getUserVar('issueId');
 				if (!isset($issueIds)) $issueIds = array();
 				$issues = array();
 				foreach ($issueIds as $issueId) {
-					$issue =& $issueDao->getIssueById($issueId);
-					if (!$issue) Request::redirect();
+					$issue =& $issueDao->getIssueById($issueId, $journal->getId());
+					if (!$issue) $request->redirect();
 					$issues[] =& $issue;
 				}
 				$this->exportIssues($journal, $issues);
 				break;
 			case 'exportIssue':
 				$issueId = array_shift($args);
-				$issue =& $issueDao->getIssueById($issueId);
-				if (!$issue) Request::redirect();
+				$issue =& $issueDao->getIssueById($issueId, $journal->getId());
+				if (!$issue) $request->redirect();
 				$this->exportIssue($journal, $issue);
 				break;
 			case 'exportArticle':
@@ -83,7 +83,7 @@ function display(&$args, $request) {
 				$this->exportArticle($journal, $result['issue'], $result['section'], $result['publishedArticle']);
 				break;
 			case 'exportArticles':
-				$articleIds = Request::getUserVar('articleId');
+				$articleIds = $request->getUserVar('articleId');
 				if (!isset($articleIds)) $articleIds = array();
 				$results =& ArticleSearch::formatResults($articleIds);
 				$this->exportArticles($results);
@@ -115,10 +115,10 @@ function display(&$args, $request) {
 				import('classes.file.TemporaryFileManager');
 				$issueDao =& DAORegistry::getDAO('IssueDAO');
 				$sectionDao =& DAORegistry::getDAO('SectionDAO');
-				$user =& Request::getUser();
+				$user =& $request->getUser();
 				$temporaryFileManager = new TemporaryFileManager();
 
-				if (($existingFileId = Request::getUserVar('temporaryFileId'))) {
+				if (($existingFileId = $request->getUserVar('temporaryFileId'))) {
 					// The user has just entered more context. Fetch an existing file.
 					$temporaryFile = TemporaryFileManager::getFile($existingFileId, $user->getId());
 				} else {
@@ -130,11 +130,11 @@ function display(&$args, $request) {
 					'user' => $user
 				);
 
-				if (($sectionId = Request::getUserVar('sectionId'))) {
+				if (($sectionId = $request->getUserVar('sectionId'))) {
 					$context['section'] = $sectionDao->getSection($sectionId);
 				}
 
-				if (($issueId = Request::getUserVar('issueId'))) {
+				if (($issueId = $request->getUserVar('issueId'))) {
 					$context['issue'] = $issueDao->getIssueById($issueId, $journal->getId());
 				}
 
@@ -435,7 +435,7 @@ function executeCLI($scriptName, &$args) {
 							echo Locale::translate('plugins.importexport.native.export.error.articleNotFound', array('articleId' => $articleId)) . "\n\n";
 							return;
 						}
-						$issue =& $issueDao->getIssueById($publishedArticle->getIssueId());
+						$issue =& $issueDao->getIssueById($publishedArticle->getIssueId(), $journal->getId());
 
 						$sectionDao =& DAORegistry::getDAO('SectionDAO');
 						$section =& $sectionDao->getSection($publishedArticle->getSectionId());

diff --git a/plugins/importexport/native/articleContext.tpl b/plugins/importexport/native/articleContext.tpl
@@ -6,7 +6,6 @@
  *
  * Prompt for "context" for article import: section and issue
  *
- * $Id$
  *}
 {strip}
 {assign var="pageTitle" value="plugins.importexport.native.import.articles"}

diff --git a/plugins/importexport/native/articles.tpl b/plugins/importexport/native/articles.tpl
@@ -6,7 +6,6 @@
  *
  * List of articles to potentially export
  *
- * $Id$
  *}
 {strip}
 {assign var="pageTitle" value="plugins.importexport.native.selectArticle"}

diff --git a/plugins/importexport/native/importError.tpl b/plugins/importexport/native/importError.tpl
@@ -6,7 +6,6 @@
  *
  * Display an error message for an aborted import process.
  *
- * $Id$
  *}
 {strip}
 {assign var="pageTitle" value="plugins.importexport.native.import.error"}

diff --git a/plugins/importexport/native/importSuccess.tpl b/plugins/importexport/native/importSuccess.tpl
@@ -6,7 +6,6 @@
  *
  * Display a list of the successfully-imported entities.
  *
- * $Id$
  *}
 {strip}
 {assign var="pageTitle" value="plugins.importexport.native.import.success"}

diff --git a/plugins/importexport/native/index.php b/plugins/importexport/native/index.php
@@ -15,9 +15,6 @@
  *
  */
 
-// $Id$
-
-
 require_once('NativeImportExportPlugin.inc.php');
 
 return new NativeImportExportPlugin();

diff --git a/plugins/importexport/native/index.tpl b/plugins/importexport/native/index.tpl
@@ -6,7 +6,6 @@
  *
  * List of operations this plugin can perform
  *
- * $Id$
  *}
 {strip}
 {assign var="pageTitle" value="plugins.importexport.native.displayName"}

diff --git a/plugins/importexport/native/issues.tpl b/plugins/importexport/native/issues.tpl
@@ -6,7 +6,6 @@
  *
  * List of issues to potentially export
  *
- * $Id$
  *}
 {strip}
 {assign var="pageTitle" value="plugins.importexport.native.selectIssue"}
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ @@
      *
      * Prompt for "context" for article import: section and issue
      *
-     * $Id$
      *}
     {strip}
     {assign var="pageTitle" value="plugins.importexport.native.import.articles"}
@@ Expand Down @@