add class Ris in Reference module,remove useless files

Westdc/Reference/Event/ReferenceEvent.php

@@ -1,15 +0,0 @@
-<?php
-namespace Reference\Event;
-
-interface ReferenceEvent
-{
-	public function checkReferenceParam(\Zend_EventManager_Event $e);
-	
-	public function processReferenceData(\Zend_EventManager_Event $e);
-	
-	public function insertToReferenceTable(\Zend_EventManager_Event $e);
-	
-	public function checkMdrefParam(\Zend_EventManager_Event $e);
-	
-	public function processMdrefData(\Zend_EventManager_Event $e);
-}

Westdc/Reference/Event/RisEvent.php

@@ -1,9 +0,0 @@
-<?php
-namespace Reference\Event;
-
-interface RisEvent
-{
-	public function checkRisReference(\Zend_EventManager_Event $e);
-	public function deleteAuthor(\Zend_EventManager_Event $e);
-	public function deleteTag(\Zend_EventManager_Event $e);
-}

Westdc/Reference/Handler/ReferenceHandler.php

@@ -1,138 +0,0 @@
-<?php
-namespace Reference\Handler;
-
-use \Helpers\View as view;
-use \Helpers\dbh;
-use \Helpers\Table;
-use \Files\Files;
-use \Reference\Reference;
-
-//事件中存在的操作
-class ReferenceHandler implements \Reference\Event\ReferenceEvent
-{
-	private $db;  			//传入PDO对象误
-	private $config;		//全局配置
-	
-	public $table;
-	public $tbl_maillog = "";		//邮件日志表
-	
-	function __construct($db = NULL)
-	{
-		if(empty($db))
-		{
-			$this->db = \Zend_Registry::get('db');
-		}else{
-			$this->db = $db;
-		}
-		
-		$this->config = \Zend_Registry::get('config');
-		$this->table = new Table();
-	}
-	
-	public function checkReferenceParam(\Zend_EventManager_Event $e)
-	{
-		$data = $e->getParam('data');
-		
-		if(!is_array($data))
-		{
-			return "参数错误";
-		}
-		
-		if(empty($data["title"]))
-		{
-			return "请输入标题";
-		}
-		
-		if(empty($data['reference']))
-		{
-			return "请输入前台引用方式，并且唯一";
-		}
-		
-		return true;
-	}
-	
-	public function processReferenceData(\Zend_EventManager_Event $e)
-	{
-		$data = $e->getParam('data');
-		
-		if(empty($data['attid']))
-		{
-			$data['attid'] = 0;
-		}
-		
-		return $data;
-	}
-	
-	public function insertToReferenceTable(\Zend_EventManager_Event $e)
-	{
-		$att = $e->getParam('file_data');
-		
-		$reference = new Reference();
-		$title = $reference->getReferenceTitleFromFilenName($att['realname']);
-		
-		$data = array(
-			'title'=>$title,
-			'attid'=>$att['id'],
-			'reference'=>$title.'---'.date("Y-m-d H:i:s").".".microtime().rand()
-		);
-		
-		$dbh = new dbh();
-		
-		$cache_data = array();
-		
-		$cache_data['ref_id'] = $dbh->insert($this->table->reference,$data,true);
-		$cache_data['ref_title'] = $title;
-		
-		return $cache_data;
-	}
-	
-	public function checkMdrefParam(\Zend_EventManager_Event $e)
-	{
-		$data = $e->getParam('data');
-		
-		if(!is_array($data))
-		{
-			return "参数错误";
-		}
-		
-		if(empty($data["refid"]))
-		{
-			return "请填写文献ID";
-		}
-		
-		if(empty($data['uuid']))
-		{
-			return "请填写UUID";
-		}
-		
-		if(!view::isUuid($data['uuid']))
-		{
-			return "UUID格式不正确";
-		}
-		
-		if(($data['reftype']===''))
-		{
-			return "请选择文献类型";
-		}
-				
-		return true;
-	}
-	
-	public function processMdrefData(\Zend_EventManager_Event $e)
-	{
-		$data = $e->getParam('data');
-		
-		if(empty($data['place']))
-		{
-			$data['place'] = 0;
-		}
-		
-		if(!is_numeric($data['place']))
-		{
-			$data['place'] = 0;
-		}
-		
-		return $data;
-	}
-	
-}

Westdc/Reference/Handler/RisHandler.php

@@ -1,36 +1,31 @@
 <?php
-namespace Reference\Handler;
+namespace Westdc\Reference\Handler;
 
-use \Helpers\View as view;
+use Zend\EventManager\EventInterface;
-use \Helpers\dbh;
+use Westdc\Service\AbstractServiceManager;
-use \Helpers\Table;
-use \Files\Files;
-use \Reference\Reference;
 
 //事件中存在的操作
-class RisHandler implements \Reference\Event\RisEvent
+class RisHandler extends AbstractServiceManager
 {
 	private $db;  			//传入PDO对象误
 	private $config;		//全局配置
 	
-	public $table;
+	private $table;
 	public $tbl_maillog = "";		//邮件日志表
 	
 	function __construct($db = NULL)
 	{
-		if(empty($db))
+        $this->dbService = $this->getServiceManager()->get('Db');
-		{
+        $this->db = $this->dbService->getPdo();
-			$this->db = \Zend_Registry::get('db');
-		}else{
-			$this->db = $db;
-		}
 		
-		$this->config = \Zend_Registry::get('config');
+		$this->table = new \stdClass;
-		$this->table = new Table();
+        $this->table->reference = "reference";
+        $this->table->reference_author = "ref_author";
+        $this->table->reference_tag = "ref_tag";
 	}
 	
 	//检查ris中的文献是否已经存在
-	public function checkRisReference(\Zend_EventManager_Event $e)
+	public function checkRisReference(EventInterface $e)
 	{
 		$ref = $e->getParam('ref');
 		
@@ -71,21 +66,19 @@ class RisHandler implements \Reference\Event\RisEvent
 	}
 	
 	//删除作者
-	public function deleteAuthor(\Zend_EventManager_Event $e)
+	public function deleteAuthor(EventInterface $e)
 	{
 		$id = $e->getParam('id');
 
-		$ref = new Reference();
+        $sql = "DELETE FROM {$this->table->reference_author} WHERE id=$id ";
-		
+        return $this->db->exec($sql);
-		return $ref->deleteReferenceAuthor($id);
 	}
 	
-	public function deleteTag(\Zend_EventManager_Event $e)
+	public function deleteTag(EventInterface $e)
 	{
 		$id = $e->getParam('id');
 
-		$ref = new Reference();
+        $sql = "DELETE FROM {$this->table->reference_tag} WHERE id=$id ";
-		
+        return $this->db->exec($sql);
-		return $ref->deleteReferenceTag($id);
 	}
 }

Westdc/Reference/Listener/ReferenceListener.php

@@ -1,48 +0,0 @@
-<?php
-namespace Reference\Listener;
-
-use Reference\Handler\ReferenceHandler;
-
-class ReferenceListener implements \Zend_EventManager_ListenerAggregate
-{
-	private $event;
-	function __construct()
-	{
-		$this->event = new \Zend_EventManager_EventManager();
-	}
-	
-	public function attach(\Zend_EventManager_EventCollection $events)
-    {
-        $this->listeners[] = $events->attach('submit.before', function($e){
-            $data = $e->getParam('data');
-
-            if(!is_array($data))
-                return "参数错误";
-
-            if(empty($data["title"]))
-                return "请输入标题";
-
-            if(empty($data['reference']))
-                return "请输入前台引用方式，并且唯一";
-
-            return true;
-        }, 100);    //参数检查
-
-        $this->listeners[] = $events->attach('submit.processData', function($e){
-            $data = $e->getParam('data');
-
-            if(empty($data['attid']))
-            {
-                $data['attid'] = 0;
-            }
-
-            return $data;
-        }, 50);
-    }
-	
-	public function detach(\Zend_EventManager_EventCollection $events)
-	{
-		
-	}
-	
-}

Westdc/Reference/Listener/RisListener.php

@@ -1,27 +1,29 @@
 <?php
-namespace Reference\Listener;
+namespace Westdc\Reference\Listener;
 
-use Reference\Handler\RisHandler;
+use Westdc\Reference\Handler\RisHandler;
+use Zend\EventManager\ListenerAggregateInterface;
+use Zend\EventManager\EventManagerInterface;
 
-class RisListener implements \Zend_EventManager_ListenerAggregate
+class RisListener implements ListenerAggregateInterface
 {
-	private $event;
+    protected $listeners = array();
-	function __construct()
-	{
-		$this->event = new \Zend_EventManager_EventManager();
-	}
 
-	public function attach(\Zend_EventManager_EventCollection $events)
+    public function attach(EventManagerInterface $events)
     {
         $Handler = new RisHandler();
 		$events->attach('checkLoad', array($Handler, 'checkRisReference'), 100);
-		$events->attach('deleteAuthor', array($Handler, 'deleteAuthor'), 100);
+		$events->attach('delete.after', array($Handler, 'deleteAuthor'), 100);
-		$events->attach('deleteTag', array($Handler, 'deleteTag'), 100);
+		$events->attach('delete.after', array($Handler, 'deleteTag'), 80);
     }
 
-	public function detach(\Zend_EventManager_EventCollection $events)
+    public function detach(EventManagerInterface $events)
-	{
+    {
-		
+        foreach ($this->listeners as $index => $listener) {
-	}
+            if ($events->detach($listener)) {
+                unset($this->listeners[$index]);
+            }
+        }
+    }
 	
 }

Westdc/Reference/Ris.php

@@ -1,49 +1,39 @@
 <?php
-namespace Reference;
+namespace Westdc\Reference;
 
-use \Helpers\View as view;
+use Zend\ServiceManager\ServiceManager;
-use \Helpers\dbh;
+use Zend\ServiceManager\ServiceManagerAwareInterface;
-use \Reference\Listener\RisListener;
+use Westdc\EventModel\AbstractEventManager;
-use \Files\Files;
+use Westdc\Reference\Listener\RisListener;
-use \LibRIS\RISReader;
+use LibRIS\RISReader;
-use \LibRIS\RISTags;
+use LibRIS\RISTags;
-use \LibRIS\RISWriter;
+use LibRIS\RISWriter;
 
-class Ris
+class Ris extends AbstractEventManager implements ServiceManagerAwareInterface
 {
-	private $db;				//传入PDO对象.
+    protected $serviceManager;
-	private $config;			//站点设置
-	private $dbh;
-	
-	protected $events = NULL;
 	public $table;
 	public $ris_records = NULL;
+    private $dbh;
 
-	function __construct($db = NULL,$mail = NULL)
+    public function setServiceManager(ServiceManager $serviceManager)
-	{
-		if(empty($db))
-		{
-			$this->db = \Zend_Registry::get('db');
-		}else{
-			$this->db = $db;
-		}
-		
-		$this->config = \Zend_Registry::get('config');
-		
-		$Listener = new RisListener();
-		@$this->events()->attachAggregate($Listener);
-		
-		$this->table = new \Helpers\Table();
-	}
-	
-	public function events(\Zend_EventManager_EventCollection $events = NULL)
     {
-        if ($events !== NULL) {
+        $this->serviceManager = $serviceManager;
-            $this->events = $events;
+
-        } elseif ($this->events === NULL) {
+        $this->init();
-            $this->events = new \Zend_EventManager_EventManager(__CLASS__);
+
-        }
+        return $this;
-        return $this->events;
+    }
+
+    public function init()
+    {
+        $Listener = new RisListener;
+        $this->getEventManager()->attachAggregate($Listener);
+
+        $this->table = new \stdClass;
+        $this->table->reference = "reference";
+        $this->table->reference_author = "ref_author";
+        $this->table->reference_tag = "ref_tag";
     }
 	
 	//ris导入
@@ -157,7 +147,8 @@ class Ris
 			return false;
 		}
 
-		$dbh = $this->dbh = new dbh();
+        $dbService = $this->serviceManager->get('Db');
+		$dbh = $this->dbh = $dbService->getDbh();
 		
 		foreach($data as $k=>$ref)
 		{
@@ -171,14 +162,13 @@ class Ris
 			
 			$ref['ris'] = $this->makeRisData(array(0=>$this->ris_records[$k]));		
 			
-			$results = $this->events()->trigger('checkLoad', $this, compact('ref'));
+			$results = $this->getEventManager()->trigger('checkLoad', $this, compact('ref'));
 			$id = $results->bottom();
 			
 			if ($id > 0)
 			{
 				$this->unsetVar($ref);
-				$this->events()->trigger('deleteAuthor', $this, compact('id'));
+				$this->getEventManager()->trigger('delete.after', $this, compact('id'));
-				$this->events()->trigger('deleteTag', $this, compact('id'));
 				
 				unset($ref['reference']);
 				
@@ -212,13 +202,14 @@ class Ris
 		
 		$ref['ris'] = $this->makeRisData(array(0=>$this->ris_records[0]));		
 
-		$this->events()->trigger('deleteAuthor', $this, compact('id'));
+		$this->getEventManager()->trigger('delete.after', $this, compact('id'));
-		$this->events()->trigger('deleteTag', $this, compact('id'));
+		$this->getEventManager()->trigger('delete.after', $this, compact('id'));
 		
 		$this->unsetVar($ref);
 		if(isset($ref['reference'])) unset($ref['reference']);
 
-		$this->dbh = $dbh = new dbh();
+        $dbService = $this->serviceManager->get('Db');
+        $this->dbh = $dbh = $dbService->getDbh();
 		
 		if($dbh->update($this->table->reference,$ref," id=$id "))
 		{