Attachment #3122 for bug #5543




	 */
	function _articleFromRow(&$article, &$row) {
		$article->setId($row['article_id']);
		$article->setLocale($row['locale']);
		$article->setUserId($row['user_id']);
		$article->setJournalId($row['journal_id']);
		$article->setSectionId($row['section_id']);

		$article->stampModified();
		$this->update(
			sprintf('INSERT INTO articles
				(locale, user_id, journal_id, section_id, language, comments_to_ed, citations, date_submitted, date_status_modified, last_modified, status, submission_progress, current_round, submission_file_id, revised_file_id, review_file_id, editor_file_id, pages, fast_tracked, hide_author, comments_status)
				VALUES
				(?, ?, ?, ?, ?, ?, ?, %s, %s, %s, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
				$this->datetimeToDB($article->getDateSubmitted()), $this->datetimeToDB($article->getDateStatusModified()), $this->datetimeToDB($article->getLastModified())),
			array(
				$article->getLocale(),
				$article->getUserId(),
				$article->getJournalId(),
				$article->getSectionId(),

(-)a/classes/article/PublishedArticleDAO.inc.php (-2 / +2 lines)

Lines 489-495 class PublishedArticleDAO extends DAO {	Link Here

489

	function &getPublishedArticleIdsAlphabetizedByJournal($journalId = null, $useCache = true) {

489

	function &getPublishedArticleIdsAlphabetizedByJournal($journalId = null, $useCache = true) {

490

		$params = array(

490

		$params = array(

491

			'cleanTitle', Locale::getLocale(),

491

			'cleanTitle', Locale::getLocale(),

492

			'cleanTitle', Locale::getPrimaryLocale()

492

			'cleanTitle'

493

);

493

);

494

		if (isset($journalId)) $params[] = $journalId;

494

		if (isset($journalId)) $params[] = $journalId;

495

Lines 503-509 class PublishedArticleDAO extends DAO {	Link Here

503

				articles a

503

				articles a

504

				LEFT JOIN sections s ON s.section_id = a.section_id

504

				LEFT JOIN sections s ON s.section_id = a.section_id

505

				LEFT JOIN article_settings atl ON (a.article_id = atl.article_id AND atl.setting_name = ? AND atl.locale = ?)

505

				LEFT JOIN article_settings atl ON (a.article_id = atl.article_id AND atl.setting_name = ? AND atl.locale = ?)

506

				LEFT JOIN article_settings atpl ON (a.article_id = atpl.article_id AND atpl.setting_name = ? AND atpl.locale = ?)

506

				LEFT JOIN article_settings atpl ON (a.article_id = atpl.article_id AND atpl.setting_name = ? AND atpl.locale = a.locale)

507

			WHERE	pa.article_id = a.article_id

507

			WHERE	pa.article_id = a.article_id

508

				AND i.issue_id = pa.issue_id

508

				AND i.issue_id = pa.issue_id

509

				AND i.published = 1

509

				AND i.published = 1

(-)a/classes/author/form/submit/AuthorSubmitStep1Form.inc.php (+1 lines)

Lines 113-118 class AuthorSubmitStep1Form extends AuthorSubmitForm {	Link Here

113

			$user =& Request::getUser();

113

			$user =& Request::getUser();

114

115

			$this->article = new Article();

115

			$this->article = new Article();

116

			$this->article->setLocale(Locale::getLocale()); // FIXME in bug #5543

116

			$this->article->setUserId($user->getId());

117

			$this->article->setUserId($user->getId());

117

			$this->article->setJournalId($journal->getId());

118

			$this->article->setJournalId($journal->getId());

118

			$this->article->setSectionId($this->getData('sectionId'));

119

			$this->article->setSectionId($this->getData('sectionId'));

(-)a/classes/submission/author/AuthorSubmissionDAO.inc.php (-2 / +1 lines)

Lines 178-184 class AuthorSubmissionDAO extends DAO {	Link Here

178

				COALESCE(sal.setting_value, sapl.setting_value) AS section_abbrev

178

				COALESCE(sal.setting_value, sapl.setting_value) AS section_abbrev

179

			FROM	articles a

179

			FROM	articles a

180

				LEFT JOIN authors aa ON (aa.submission_id = a.article_id AND aa.primary_contact = 1)

180

				LEFT JOIN authors aa ON (aa.submission_id = a.article_id AND aa.primary_contact = 1)

181

				LEFT JOIN article_settings atpl ON (atpl.article_id = a.article_id AND atpl.setting_name = ? AND atpl.locale = ?)

181

				LEFT JOIN article_settings atpl ON (atpl.article_id = a.article_id AND atpl.setting_name = ? AND atpl.locale = a.locale)

182

				LEFT JOIN article_settings atl ON (atl.article_id = a.article_id AND atl.setting_name = ? AND atl.locale = ?)

182

				LEFT JOIN article_settings atl ON (atl.article_id = a.article_id AND atl.setting_name = ? AND atl.locale = ?)

183

				LEFT JOIN sections s ON (s.section_id = a.section_id)

183

				LEFT JOIN sections s ON (s.section_id = a.section_id)

184

				LEFT JOIN section_settings stpl ON (s.section_id = stpl.section_id AND stpl.setting_name = ? AND stpl.locale = ?)

184

				LEFT JOIN section_settings stpl ON (s.section_id = stpl.section_id AND stpl.setting_name = ? AND stpl.locale = ?)

Lines 191-197 class AuthorSubmissionDAO extends DAO {	Link Here

191

			array(

191

			array(

192

				$locale,

192

				$locale,

193

				'cleanTitle',

193

				'cleanTitle',

194

				$primaryLocale,

195

				'cleanTitle',

194

				'cleanTitle',

196

				$locale,

195

				$locale,

197

				'title',

196

				'title',

(-)a/classes/submission/copyeditor/CopyeditorSubmissionDAO.inc.php (-2 / +1 lines)

Lines 144-150 class CopyeditorSubmissionDAO extends DAO {	Link Here

144

			'abbrev',

144

			'abbrev',

145

			$locale,

145

			$locale,

146

			'cleanTitle', // Article title

146

			'cleanTitle', // Article title

147

			$primaryLocale,

148

			'cleanTitle', // Article title

147

			'cleanTitle', // Article title

149

			$locale,

148

			$locale,

150

			ASSOC_TYPE_ARTICLE,

149

			ASSOC_TYPE_ARTICLE,

Lines 263-269 class CopyeditorSubmissionDAO extends DAO {	Link Here

263

				LEFT JOIN section_settings stl ON (s.section_id = stl.section_id AND stl.setting_name = ? AND stl.locale = ?)

262

				LEFT JOIN section_settings stl ON (s.section_id = stl.section_id AND stl.setting_name = ? AND stl.locale = ?)

264

				LEFT JOIN section_settings sapl ON (s.section_id = sapl.section_id AND sapl.setting_name = ? AND sapl.locale = ?)

263

				LEFT JOIN section_settings sapl ON (s.section_id = sapl.section_id AND sapl.setting_name = ? AND sapl.locale = ?)

265

				LEFT JOIN section_settings sal ON (s.section_id = sal.section_id AND sal.setting_name = ? AND sal.locale = ?)

264

				LEFT JOIN section_settings sal ON (s.section_id = sal.section_id AND sal.setting_name = ? AND sal.locale = ?)

266

				LEFT JOIN article_settings atpl ON (atpl.article_id = a.article_id AND atpl.setting_name = ? AND atpl.locale = ?)

265

				LEFT JOIN article_settings atpl ON (atpl.article_id = a.article_id AND atpl.setting_name = ? AND atpl.locale = a.locale)

267

				LEFT JOIN article_settings atl ON (a.article_id = atl.article_id AND atl.setting_name = ? AND atl.locale = ?)

266

				LEFT JOIN article_settings atl ON (a.article_id = atl.article_id AND atl.setting_name = ? AND atl.locale = ?)

268

				LEFT JOIN signoffs scpf ON (a.article_id = scpf.assoc_id AND scpf.assoc_type = ? AND scpf.symbolic = ?)

267

				LEFT JOIN signoffs scpf ON (a.article_id = scpf.assoc_id AND scpf.assoc_type = ? AND scpf.symbolic = ?)

269

				LEFT JOIN signoffs sle ON (a.article_id = sle.assoc_id AND sle.assoc_type = ? AND sle.symbolic = ?)

268

				LEFT JOIN signoffs sle ON (a.article_id = sle.assoc_id AND sle.assoc_type = ? AND sle.symbolic = ?)

(-)a/classes/submission/editor/EditorSubmissionDAO.inc.php (-2 / +1 lines)

Lines 197-203 class EditorSubmissionDAO extends DAO {	Link Here

197

			'abbrev',

197

			'abbrev',

198

			$locale,

198

			$locale,

199

			'cleanTitle', // Article title

199

			'cleanTitle', // Article title

200

			$primaryLocale,

201

			'cleanTitle',

200

			'cleanTitle',

202

			$locale,

201

			$locale,

203

			$journalId

202

			$journalId

Lines 298-304 class EditorSubmissionDAO extends DAO {	Link Here

298

				LEFT JOIN section_settings stl ON (s.section_id = stl.section_id AND stl.setting_name = ? AND stl.locale = ?)

297

				LEFT JOIN section_settings stl ON (s.section_id = stl.section_id AND stl.setting_name = ? AND stl.locale = ?)

299

				LEFT JOIN section_settings sapl ON (s.section_id = sapl.section_id AND sapl.setting_name = ? AND sapl.locale = ?)

298

				LEFT JOIN section_settings sapl ON (s.section_id = sapl.section_id AND sapl.setting_name = ? AND sapl.locale = ?)

300

				LEFT JOIN section_settings sal ON (s.section_id = sal.section_id AND sal.setting_name = ? AND sal.locale = ?)

299

				LEFT JOIN section_settings sal ON (s.section_id = sal.section_id AND sal.setting_name = ? AND sal.locale = ?)

301

				LEFT JOIN article_settings atpl ON (a.article_id = atpl.article_id AND atpl.setting_name = ? AND atpl.locale = ?)

300

				LEFT JOIN article_settings atpl ON (a.article_id = atpl.article_id AND atpl.setting_name = ? AND atpl.locale = a.locale)

302

				LEFT JOIN article_settings atl ON (a.article_id = atl.article_id AND atl.setting_name = ? AND atl.locale = ?)

301

				LEFT JOIN article_settings atl ON (a.article_id = atl.article_id AND atl.setting_name = ? AND atl.locale = ?)

303

				LEFT JOIN edit_assignments ea ON (a.article_id = ea.article_id)

302

				LEFT JOIN edit_assignments ea ON (a.article_id = ea.article_id)

304

				LEFT JOIN edit_assignments ea2 ON (a.article_id = ea2.article_id AND ea.edit_id < ea2.edit_id)

303

				LEFT JOIN edit_assignments ea2 ON (a.article_id = ea2.article_id AND ea.edit_id < ea2.edit_id)




		$primaryLocale = Locale::getPrimaryLocale();
		$locale = Locale::getLocale();
		$params = array(
			'title', // Section title
			$primaryLocale,
			'title',
			$locale,
			'abbrev', // Section abbrev.
			$primaryLocale,
			'abbrev',
			$locale,
			'cleanTitle', // Article title
			$primaryLocale,
			'cleanTitle',
			$locale,
			ASSOC_TYPE_ARTICLE,

				LEFT JOIN section_settings stl ON (s.section_id = stl.section_id AND stl.setting_name = ? AND stl.locale = ?)
				LEFT JOIN section_settings sapl ON (s.section_id = sapl.section_id AND sapl.setting_name = ? AND sapl.locale = ?)
				LEFT JOIN section_settings sal ON (s.section_id = sal.section_id AND sal.setting_name = ? AND sal.locale = ?)
				LEFT JOIN article_settings atpl ON (atpl.article_id = a.article_id AND atpl.setting_name = ? AND atpl.locale = a.locale)
				LEFT JOIN article_settings atl ON (a.article_id = atl.article_id AND atl.setting_name = ? AND atl.locale = ?)
				LEFT JOIN signoffs scpf ON (a.article_id = scpf.assoc_id AND scpf.assoc_type = ? AND scpf.symbolic = ?)
				LEFT JOIN signoffs sle ON (a.article_id = sle.assoc_id AND sle.assoc_type = ? AND sle.symbolic = ?)




		$locale = Locale::getLocale();

		$params = array(
			'title', // Section title
			$primaryLocale,
			'title',
			$locale,
			'abbrev', // Section abbrev.
			$primaryLocale,
			'abbrev',
			$locale,
			'cleanTitle', // Article title
			$primaryLocale,
			'cleanTitle',
			$locale,
			ASSOC_TYPE_ARTICLE, 

				LEFT JOIN section_settings stl ON (s.section_id = stl.section_id AND stl.setting_name = ? AND stl.locale = ?)
				LEFT JOIN section_settings sapl ON (s.section_id = sapl.section_id AND sapl.setting_name = ? AND sapl.locale = ?)
				LEFT JOIN section_settings sal ON (s.section_id = sal.section_id AND sal.setting_name = ? AND sal.locale = ?)
				LEFT JOIN article_settings atpl ON (atpl.article_id = a.article_id AND atpl.setting_name = ? AND atpl.locale = a.locale)
				LEFT JOIN article_settings atl ON (a.article_id = atl.article_id AND atl.setting_name = ? and atl.locale = ?)
				LEFT JOIN signoffs scpf ON (a.article_id = scpf.assoc_id AND scpf.assoc_type = ? AND scpf.symbolic = ?)
				LEFT JOIN signoffs sle ON (a.article_id = sle.assoc_id AND sle.assoc_type = ? AND sle.symbolic = ?)




				COALESCE(sal.setting_value, sapl.setting_value) AS section_abbrev
			FROM	articles a
				LEFT JOIN review_assignments r ON (a.article_id = r.submission_id)
				LEFT JOIN article_settings atpl ON (atpl.article_id = a.article_id AND atpl.setting_name = ? AND atpl.locale = a.locale)
				LEFT JOIN article_settings atl ON (atl.article_id = a.article_id AND atl.setting_name = ? AND atl.locale = ?)
				LEFT JOIN sections s ON (s.section_id = a.section_id)
				LEFT JOIN users u ON (r.reviewer_id = u.user_id)

		$result =& $this->retrieveRange(
			$sql,
			array(
				'cleanTitle', // Article title
				$primaryLocale,
				'cleanTitle',
				$locale,
				'title', // Section title
				$primaryLocale,
				'title',
				$locale,
				'abbrev', // Section abbreviation
				$primaryLocale,
				'abbrev',
				$locale,




			'abbrev',
			$locale,
			'cleanTitle', // Article title
			'cleanTitle',
			$locale,
			'cleanTitle', // Article title
			$primaryLocale,
			$journalId,
			$sectionEditorId
		);

				LEFT JOIN section_settings stl ON (s.section_id = stl.section_id AND stl.setting_name = ? AND stl.locale = ?)
				LEFT JOIN section_settings sapl ON (s.section_id = sapl.section_id AND sapl.setting_name = ? AND sapl.locale = ?)
				LEFT JOIN section_settings sal ON (s.section_id = sal.section_id AND sal.setting_name = ? AND sal.locale = ?)
				LEFT JOIN article_settings atpl ON (atpl.article_id = a.article_id AND atpl.setting_name = ? AND atpl.locale = a.locale)
				LEFT JOIN article_settings atl ON (a.article_id = atl.article_id AND atl.setting_name = ? AND atl.locale = ?)
				LEFT JOIN edit_decisions edec ON (a.article_id = edec.article_id)
				LEFT JOIN edit_decisions edec2 ON (a.article_id = edec2.article_id AND edec.edit_decision_id < edec2.edit_decision_id)

(-)a/dbscripts/xml/ojs_schema.xml (+1 lines)

Lines 423-428	Link Here

423

			<KEY />

423

			<KEY />

424

			<AUTOINCREMENT />

424

			<AUTOINCREMENT />

425

		</field>

425

		</field>

426

		<field name="locale" type="C2" size="5" />

426

		<field name="user_id" type="I8">

427

		<field name="user_id" type="I8">

427

			<NOTNULL />

428

			<NOTNULL />

428

		</field>

429

		</field>

(-)a/dbscripts/xml/upgrade/2.3.2_update.xml (+9 lines)

Lines 32-35	Link Here

	<sql>

	<sql>

		<query>UPDATE notes SET assoc_type = 257</query><!-- ASSOC_TYPE_ARTICLE -->

		<query>UPDATE notes SET assoc_type = 257</query><!-- ASSOC_TYPE_ARTICLE -->

	</sql>

	</sql>

	<!-- Bug #5543: Implement multilingual specification -->

	<sql>

		<query driver="mysql">

			UPDATE articles a, journals j SET a.locale = j.primary_locale WHERE a.journal_id = j.journal_id

		</query>

		<query driver="postgres7">

			UPDATE articles SET locale = j.primary_locale FROM journals j WHERE articles.journal_id = j.journal_id

		</query>

	</sql>

</data>

</data>

(-)a/lib/pkp (-1 / +1 lines)

Line 1	Link Here

Subproject commit 794da05073ebccb3bccd1b2b024fab742c444ae7

Subproject commit 0171a4dc5cd17722a3f5c23e35c81726c8a4abfe

(-)a/plugins/importexport/native/NativeImportDom.inc.php (+1 lines)

Lines 636-641 class NativeImportDom {	Link Here

636

		$articleDao =& DAORegistry::getDAO('ArticleDAO');

636

		$articleDao =& DAORegistry::getDAO('ArticleDAO');

637

638

		$article = new Article();

638

		$article = new Article();

639

		$article->setLocale($journalPrimaryLocale); // FIXME in bug #5543

639

		$article->setJournalId($journal->getId());

640

		$article->setJournalId($journal->getId());

640

		$article->setUserId($user->getId());

641

		$article->setUserId($user->getId());

641

		$article->setSectionId($section->getId());

642

		$article->setSectionId($section->getId());

(-)a/plugins/importexport/quickSubmit/QuickSubmitForm.inc.php (+1 lines)

Lines 154-159 class QuickSubmitForm extends Form {	Link Here

154

		$user =& Request::getUser();

154

		$user =& Request::getUser();

155

156

		$article = new Article();

156

		$article = new Article();

157

		$article->setLocale($journal->getPrimaryLocale()); // FIXME in bug #5543

157

		$article->setUserId($user->getId());

158

		$article->setUserId($user->getId());

158

		$article->setJournalId($journal->getId());

159

		$article->setJournalId($journal->getId());

159

		$article->setSectionId($this->getData('sectionId'));

160

		$article->setSectionId($this->getData('sectionId'));




				COALESCE(sl.setting_value, spl.setting_value) AS section_title,
				a.status AS status,
				a.language AS language
			FROM	articles a
				LEFT JOIN article_settings aspl1 ON (aspl1.article_id=a.article_id AND aspl1.setting_name = ? AND aspl1.locale = a.locale)
				LEFT JOIN article_settings asl1 ON (asl1.article_id=a.article_id AND asl1.setting_name = ? AND asl1.locale = ?)
				LEFT JOIN article_settings aspl2 ON (aspl2.article_id=a.article_id AND aspl2.setting_name = ? AND aspl2.locale = a.locale)
				LEFT JOIN article_settings asl2 ON (asl2.article_id=a.article_id AND asl2.setting_name = ? AND asl2.locale = ?)
				LEFT JOIN section_settings spl ON (spl.section_id=a.section_id AND spl.setting_name = ? AND spl.locale = ?)
				LEFT JOIN section_settings sl ON (sl.section_id=a.section_id AND sl.setting_name = ? AND sl.locale = ?)
			WHERE	a.journal_id = ?
			WHERE
				a.journal_id = ?
			ORDER BY a.article_id',
			array(
				'title', // Article title
				$primaryLocale,
				'title',
				$locale,
				'abstract', // Article abstract
				$primaryLocale,
				'abstract',
				$locale,
				'title',




			FROM	review_assignments r
				LEFT JOIN articles a ON r.submission_id = a.article_id
				LEFT JOIN article_settings asl ON (a.article_id=asl.article_id AND asl.locale=? AND asl.setting_name=?)
				LEFT JOIN article_settings aspl ON (a.article_id=aspl.article_id AND aspl.locale=a.locale AND aspl.setting_name=?),
				users u
			WHERE	u.user_id=r.reviewer_id AND a.journal_id= ?
			ORDER BY article',
			array(
				$locale, // Article title
				'title',
				$primaryLocale,
				'title',
				$journalId
			)

Return to bug 5543