From 1b9113cde273ca464cff76fe6c037d457a2a44f2 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Wed, 3 Oct 2012 16:50:19 +0000 Subject: [PATCH] --- inc/ws/DAO/class.ws.dao.book.php | 2 +- inc/ws/Util/class.ws.links.php | 26 ++++++++++++++------------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php index fd5943078..e1756fc04 100644 --- a/inc/ws/DAO/class.ws.dao.book.php +++ b/inc/ws/DAO/class.ws.dao.book.php @@ -440,7 +440,7 @@ class wsDAOBook extends commonDAO { foreach ($chapters as $c) { $c['label'] = trim($c['label']); $n = (string) $c['page']; - $c['label'] = trim(preg_replace('|' . $n . '$|iu', '', $c['label'])); + $c['label'] = trim(preg_replace('|\s+' . $n . '$|iu', '', $c['label'])); $res[] = $c; } diff --git a/inc/ws/Util/class.ws.links.php b/inc/ws/Util/class.ws.links.php index 8ca5cec4a..65aba188c 100644 --- a/inc/ws/Util/class.ws.links.php +++ b/inc/ws/Util/class.ws.links.php @@ -27,13 +27,13 @@ class wsLinks { ); new PHPExcel(); - - $cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_memcache; - $cacheSettings = array('memcacheServer' => 'localhost', - 'memcachePort' => 11211, - 'cacheTime' => 600 - ); - PHPExcel_Settings::setCacheStorageMethod($cacheMethod, $cacheSettings); + + /* $cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_memcache; + $cacheSettings = array('memcacheServer' => 'localhost', + 'memcachePort' => 11211, + 'cacheTime' => 600 + ); + PHPExcel_Settings::setCacheStorageMethod($cacheMethod, $cacheSettings); */ $xls = new PHPExcel(); @@ -72,24 +72,26 @@ class wsLinks { } $value = $l[$id]; } - - $s->setCellValueByColumnAndRow($i, $j, $value); - $s->getStyleByColumnAndRow($i, $j)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT); + if ($value != '') { + $s->setCellValueByColumnAndRow($i, $j, $value); + //$s->getStyleByColumnAndRow($i, $j)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT); + } $i++; } $j++; } + // Rulers $s = $xls->createSheet(); $s->setTitle('Rulers'); - $rcols = array( 'page', 'type', 'pos'); + $rcols = array('page', 'type', 'pos'); $i = 0; // Labels foreach ($rcols as $id) { $s->setCellValueByColumnAndRow($i, 1, $id); $s->getColumnDimensionByColumn($i)->setAutoSize(true); - $s->getStyleByColumnAndRow($i, 1)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER); + //$s->getStyleByColumnAndRow($i, 1)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER); $i++; } -- 2.39.5