From fd44d03d9a7c5f5d0082c12e846765490b953d2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Didier=20Corbi=C3=A8re?= <didier.corbiere@opale-concept.com>
Date: Fri, 13 Sep 2013 00:08:15 +0100
Subject: [PATCH] Add Isbn, Rights and Publisher properties

---
 resources/epub-loader/BookExport.class.php | 10 ++++++----
 resources/epub-loader/BookInfos.class.php  | 10 ++++++----
 resources/epub-loader/CsvExport.class.php  |  8 ++++++++
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/resources/epub-loader/BookExport.class.php b/resources/epub-loader/BookExport.class.php
index 20eb829..79c480d 100644
--- a/resources/epub-loader/BookExport.class.php
+++ b/resources/epub-loader/BookExport.class.php
@@ -77,8 +77,9 @@ class BookExport
 			$this->mExport->SetProperty($i++, 'Description');
 			$this->mExport->SetProperty($i++, 'Subjects');
 			$this->mExport->SetProperty($i++, 'Cover');
-			$this->mExport->SetProperty($i++, 'Serie');
-			$this->mExport->SetProperty($i++, 'SerieIndex');
+			$this->mExport->SetProperty($i++, 'Isbn');
+			$this->mExport->SetProperty($i++, 'Rights');
+			$this->mExport->SetProperty($i++, 'Publisher');
 			$this->mExport->AddContent();
 		}
 
@@ -95,8 +96,9 @@ class BookExport
 		$this->mExport->SetProperty($i++, $inBookInfo->mDescription);
 		$this->mExport->SetProperty($i++, implode(' - ', $inBookInfo->mSubjects));
 		$this->mExport->SetProperty($i++, $inBookInfo->mCover);
-		$this->mExport->SetProperty($i++, $inBookInfo->mSerie);
-		$this->mExport->SetProperty($i++, $inBookInfo->mSerieIndex);
+		$this->mExport->SetProperty($i++, $inBookInfo->mIsbn);
+		$this->mExport->SetProperty($i++, $inBookInfo->mRights);
+		$this->mExport->SetProperty($i++, $inBookInfo->mPublisher);
 
 		$this->mExport->AddContent();
 	}
diff --git a/resources/epub-loader/BookInfos.class.php b/resources/epub-loader/BookInfos.class.php
index a9076eb..9928523 100644
--- a/resources/epub-loader/BookInfos.class.php
+++ b/resources/epub-loader/BookInfos.class.php
@@ -27,8 +27,9 @@ class BookInfos
 	public $mDescription = '';
 	public $mSubjects = null;
 	public $mCover = '';
-	public $mSerie = '';
-	public $mSerieIndex = '';
+	public $mIsbn = '';
+	public $mRights = '';
+	public $mPublisher = '';
 
 	/**
 	 * Loads book infos from an epub file
@@ -56,8 +57,9 @@ class BookInfos
 		$this->mDescription = $epub->Description();
 		$this->mSubjects = $epub->Subjects();
 		$this->mCover = $epub->getCoverItem();
-		$this->mSerie = $epub->Serie();
-		$this->mSerieIndex = $epub->SerieIndex();
+		$this->mIsbn = $epub->ISBN();
+		$this->mRights = $epub->Copyright();
+		$this->mPublisher = $epub->Publisher();
 	}
 
 }
diff --git a/resources/epub-loader/CsvExport.class.php b/resources/epub-loader/CsvExport.class.php
index 20b58c4..be31b4e 100644
--- a/resources/epub-loader/CsvExport.class.php
+++ b/resources/epub-loader/CsvExport.class.php
@@ -42,11 +42,19 @@ class CsvExport extends BaseExport
 			$info = '';
 			if (is_array($value)) {
 				foreach ($value as $value1) {
+					// Escape quotes
+					if (strpos($value1, '\'') !== false) {
+						$value1 = '\'' . str_replace('\'', '\'\'', $value1) . '\'';
+					}
 					$text .= $value1 . self::CsvSeparator;
 				}
 				continue;
 			}
 			else {
+				// Escape quotes
+				if (strpos($value, '\'') !== false) {
+					$value = '\'' . str_replace('\'', '\'\'', $value) . '\'';
+				}
 				$info = $value;
 			}
 			$text .= $info . self::CsvSeparator;