content ?>url)) echo "，系统正在为您跳转..."?>
url)) {?>
- url == -1) { ?>
+ url)) { ?>
如果没有跳转请点击这样
-
+
如果没有跳转请点击这样
diff --git a/application/default/controllers/AccountController.php b/application/default/controllers/AccountController.php
index b101a897..40dd9b20 100755
--- a/application/default/controllers/AccountController.php
+++ b/application/default/controllers/AccountController.php
@@ -294,7 +294,7 @@ class AccountController extends Zend_Controller_Action
'controller' => $this->_request->getControllerName(),
'action' => $this->_request->getActionName(),
);
-
+
$auth = Zend_Auth::getInstance();
if ($auth->hasIdentity())
{
@@ -306,7 +306,12 @@ class AccountController extends Zend_Controller_Action
if(($options['module']=="default" && $options['controller'] == "account" && $options['action'] == "login"))
{
- $this->view->href = '/';
+ $this->view->href = $_SERVER['REQUEST_URI'];
+ }
+
+ if($tohref == "/account/login")
+ {
+ $this->view->href = $tohref = "/";
}
if(!empty($tohref))
@@ -364,13 +369,12 @@ class AccountController extends Zend_Controller_Action
}
else
{
-
if(!empty($tohref))
{
view::Post($this,"登录成功，正在跳转",$tohref);
return true;
}
-
+
if($options['module']=="default" && $options['controller'] == "account" && $options['action'] == "login")
{
view::Post($this,"登录成功，正在跳转",'/');
@@ -592,6 +596,7 @@ class AccountController extends Zend_Controller_Action
}
}
- }
+ } //找回密码
+
}
diff --git a/application/models/Dataorder.php b/application/models/Dataorder.php
index 0d7da23c..0a96dd04 100644
--- a/application/models/Dataorder.php
+++ b/application/models/Dataorder.php
@@ -24,8 +24,12 @@ class Dataorder
if ($statu==4)
$wheresql[] = " (o.ts_approved is null and o.pdflink is not null and d.status=4) ";
elseif ($statu==-1)
- $wheresql[] = " (o.pdflink is not null and o.status=-1)";
- else
+ $wheresql[] = " (o.pdflink is not null and d.status=-1)";
+ elseif ($statu == 3)
+ $wheresql[] = " (o.applicationform is not null and d.status=3 ) ";
+ elseif ($statu == 5)
+ $wheresql[] = " (o.status=5) ";
+ else
$wheresql[] = " (o.ts_approved is null and o.pdflink is not null and d.status in (3,4))";
if(!empty($q))
diff --git a/application/module/Helpers/Table.php b/application/module/Helpers/Table.php
index ce960ef7..1f598c44 100644
--- a/application/module/Helpers/Table.php
+++ b/application/module/Helpers/Table.php
@@ -12,4 +12,10 @@ class Table
//数据申请
public $offlineapp = "offlineapp";
+
+ //Source
+ public $source = "source";
+
+ //元数据
+ public $metadata = "metadata";
}
\ No newline at end of file
diff --git a/application/module/Helpers/View.php b/application/module/Helpers/View.php
index 703b189b..52d8d287 100644
--- a/application/module/Helpers/View.php
+++ b/application/module/Helpers/View.php
@@ -131,9 +131,30 @@ class View extends \Zend_Controller_Plugin_Abstract
return $protocol."://".$_SERVER['SERVER_NAME'];
}
- static function isXmlHttpRequest()
+ static function isXmlHttpRequest($ctl = NULL)
{
- $zfhttp = new \Zend_Controller_Request_Http();
- return $zfhttp->isXmlHttpRequest();
+ $request = new \Zend_Controller_Request_Http();
+ if($request->isXmlHttpRequest())
+ {
+ if(!empty($ctl))
+ {
+ $helper = new \Zend_Controller_Action_HelperBroker($ctl);
+ $helper->layout->disableLayout();
+ $helper->viewRenderer->setNoRender();
+ }
+ return true;
+ }else{
+ return false;
+ }
+ }
+
+ static function isUuid($uuid)
+ {
+ if(!preg_match("/^[0-9A-Za-z]{8}-[0-9A-Za-z]{4}-[0-9A-Za-z]{4}-[0-9A-Za-z]{4}-[0-9A-Za-z]{12}$/",$uuid))
+ {
+ return false;
+ }else{
+ return true;
+ }
}
}
\ No newline at end of file
diff --git a/application/module/Order/Order.php b/application/module/Order/Order.php
index 64290e10..afc15dbe 100644
--- a/application/module/Order/Order.php
+++ b/application/module/Order/Order.php
@@ -229,6 +229,14 @@ class Order
return $data;
}
+ $results = $this->events()->trigger('order.pdfNumCheck', $this, compact('uid'));
+ $data = $results->bottom();
+
+ if($data !== true)
+ {
+ return $data;
+ }
+
$results = $this->events()->trigger('order.onUpdate', $this, compact('formData','uid'));
$data = $results->bottom();
@@ -259,6 +267,14 @@ class Order
return $data;
}
+ $results = $this->events()->trigger('order.pdfNumCheck', $this, compact('uid'));
+ $data = $results->bottom();
+
+ if($data !== true)
+ {
+ return $data;
+ }
+
$pdf = $this->pdfPrint($formData,$uid,true,true);
$returnid = true;
@@ -385,7 +401,15 @@ class Order
$uid = $user->id;
- $sql="update dataorder set status=3 where status=2 and userid=$uid and offlineappid=$offlineappid";
+ $results = $this->events()->trigger('order.pdfNumCheck', $this, compact('uid'));
+ $data = $results->bottom();
+
+ if($data !== true)
+ {
+ return $data;
+ }
+
+ $sql = "update dataorder set status=3 where status=2 and userid=$uid and offlineappid=$offlineappid";
if($this->db->exec($sql) < 0)
{
return "数据篮状态更新失败，请重试";
@@ -399,7 +423,7 @@ class Order
$data = array(
"user" => empty($user->realname) ? $user->username : $user->realname,
- "link"=> view::getHostLink() . '/admin/down/offlineapps/ac/view/offlineappid/'.$offlineappid
+ "link"=> view::getHostLink() . '/admin/down/offlineapp/ac/view/offlineappid/'.$offlineappid
);
$mail = new Mail();
diff --git a/application/module/Order/listener/OrderListener.php b/application/module/Order/listener/OrderListener.php
index 23ccf98c..57dc5d5b 100644
--- a/application/module/Order/listener/OrderListener.php
+++ b/application/module/Order/listener/OrderListener.php
@@ -45,6 +45,7 @@ class OrderListener implements \Zend_EventManager_ListenerAggregate
$events->attach('order.formcheck', array($PdfFormClass, 'checkPdfOrderField'), 100);
$PdfClass = new PdfOperate();
+ $events->attach('order.pdfNumCheck', array($PdfClass, 'checkPdfOrderNum'), 100);
$events->attach('order.onUpdate', array($PdfClass, 'updateUserInfo'), 100);
$events->attach('order.onSubmited', array($PdfClass, 'orderSubmited'), 100);
}
diff --git a/application/module/Order/mount/PdfOperate.php b/application/module/Order/mount/PdfOperate.php
index 4306f05d..a9ecfcd6 100644
--- a/application/module/Order/mount/PdfOperate.php
+++ b/application/module/Order/mount/PdfOperate.php
@@ -137,6 +137,27 @@ class PdfOperate implements \Order\listener\PdfEvents
return true;
}
+ //检查生成pdf的数量
+ public function checkPdfOrderNum(\Zend_EventManager_Event $e)
+ {
+ $uid = (int)$e->getParam('uid');
+ if(empty($uid))
+ {
+ $uid = view::User('id');
+ }
+
+ $sql = "select count(*) as datacount from {$this->tbl_dataorder} where (ts_approved is null) and userid=? and status=2 AND offlineappid=-1";
+ $rs = $this->db->fetchRow($this->db->quoteInto($sql,$uid));
+ $inorder = $rs['datacount'];
+
+ if($inorder <= $this->config->download->max)
+ {
+ return true;
+ }else{
+ return "本次订单将使申请数量超过限制，所以无法生成PDF，请在数据篮-待提交订单中移除相应数据，确保待提交的数据申请条数小于等于5条，然后再重新生成。";
+ }
+ }
+
//发送邮件通知
public function sendEmail($formData,$pdf)
{
diff --git a/application/module/Reference/Event/ReferenceEvent.php b/application/module/Reference/Event/ReferenceEvent.php
index 775e776a..dcb12efa 100644
--- a/application/module/Reference/Event/ReferenceEvent.php
+++ b/application/module/Reference/Event/ReferenceEvent.php
@@ -7,4 +7,5 @@ interface ReferenceEvent
public function processReferenceData(\Zend_EventManager_Event $e);
+ public function insertToReferenceTable(\Zend_EventManager_Event $e);
}
\ No newline at end of file
diff --git a/application/module/Reference/Handler/ReferenceHandler.php b/application/module/Reference/Handler/ReferenceHandler.php
index e2e35e58..13b022ab 100644
--- a/application/module/Reference/Handler/ReferenceHandler.php
+++ b/application/module/Reference/Handler/ReferenceHandler.php
@@ -1,8 +1,11 @@
config = \Zend_Registry::get('config');
+ $this->table = new Table();
}
public function checkReferenceParam(\Zend_EventManager_Event $e)
@@ -58,4 +63,27 @@ class ReferenceHandler implements \Reference\Event\ReferenceEvent
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;
+ }
+
}
\ No newline at end of file
diff --git a/application/module/Reference/Listener/ReferenceListener.php b/application/module/Reference/Listener/ReferenceListener.php
index 8b863e2e..d63505c4 100644
--- a/application/module/Reference/Listener/ReferenceListener.php
+++ b/application/module/Reference/Listener/ReferenceListener.php
@@ -16,6 +16,7 @@ class ReferenceListener implements \Zend_EventManager_ListenerAggregate
$Handler = new ReferenceHandler();
$events->attach('submit.checkParam', array($Handler, 'checkReferenceParam'), 100);
$events->attach('submit.processData', array($Handler, 'processReferenceData'), 100);
+ $events->attach('upload.insertToReferenceTable', array($Handler, 'insertToReferenceTable'), 100);
}
public function detach(\Zend_EventManager_EventCollection $events)
diff --git a/application/module/Reference/Reference.php b/application/module/Reference/Reference.php
index fe936e0e..417b2213 100644
--- a/application/module/Reference/Reference.php
+++ b/application/module/Reference/Reference.php
@@ -13,6 +13,11 @@ class Reference
protected $events = NULL;
public $table;
+ public $keyword;
+ public $order;
+ public $sort = "DESC";
+
+ public $reftype;
function __construct($db = NULL,$mail = NULL)
{
@@ -84,22 +89,23 @@ class Reference
{
$request = new \Zend_Controller_Request_Http();
$data = array(
- 'reference'=>$request->getParam('reference'),
- 'link'=>$request->getParam('link'),
- 'publisher'=>$request->getParam('publisher'),
- 'year' => $request->getParam('year'),
- 'title' => $request->getParam('title'),
- 'bibtex' => $request->getParam('bibtex'),
- 'attid' => $request->getParam('attid')
+ 'reference' => trim($request->getParam('reference')),
+ 'link' => trim($request->getParam('link')),
+ 'publisher' => trim($request->getParam('publisher')),
+ 'year' => (int)$request->getParam('year'),
+ 'title' => trim($request->getParam('title')),
+ 'ris' => trim($request->getParam('ris')),
+ 'note' => trim($request->getParam('note')),
+ 'attid' => (int)$request->getParam('attid')
);
return $data;
}
//上传文献PDF
- public function uploadReferencePdf($file)
+ public function uploadReferencePdf($file,$autoread = false)
{
$files = new Files();
- $file_info = $files->upload($file,'reference/',true);
+ $file_info = $files->upload($file,'literature/',true);
if(isset($file_info['error']) && !empty($file_info['error']))
{
@@ -108,7 +114,7 @@ class Reference
$file_data = array(
'filename' => $file_info['file_url'],
- 'filetype' => 'reference',
+ 'filetype' => 'literature',
'filedesc' => $file_info['file_mime'],
'userid' => view::User('id'),
'filesize' => $file_info['file_size'],
@@ -118,12 +124,27 @@ class Reference
$dbh = new dbh();
$file_id = $dbh->insert($this->table->attachments,$file_data,true);
-
$file_data['id'] = $file_id;
+ if($autoread)
+ {
+ $params = compact('file_data');
+ $results = $this->events()->trigger('upload.insertToReferenceTable', $this, $params);
+ $cache_data = $results->bottom();
+ $file_data = array_merge($file_data,$cache_data);
+ }
+
return $file_data;
}
+ //通过文件名自动提取文章标题
+ public function getReferenceTitleFromFilenName($filename)
+ {
+ $file = new Files();
+ $title = str_replace( ".".$file->getFileTextExt($filename),"",$filename);
+ return $title;
+ }
+
//删除文献文件
public function deleteReferenceAttchment($attid)
{
@@ -146,11 +167,64 @@ class Reference
//所有文献
public function fetchReferences()
{
- $sql = "SELECT * FROM {$this->table->reference} ORDER BY id DESC";
+ $wheresql = array();
+ if(!empty($this->keyword))
+ {
+ $wheresql[] = " ({$this->table->reference}.title LIKE '%{$this->keyword}%' OR {$this->table->reference}.reference LIKE '%{$this->keyword}%') ";
+ }
+ if(count($wheresql)>0)
+ {
+ $wheresql = " WHERE ".join(" AND ",$wheresql);
+ }else{
+ $wheresql = "";
+ }
+
+ if(empty($this->order))
+ {
+ $order = "{$this->table->reference}.title";
+ }else{
+ $order = "{$this->table->reference}.{$this->order}";
+ }
+
+ $sql = "SELECT {$this->table->reference}.* FROM
+ {$this->table->reference}
+ $wheresql
+ ORDER BY $order {$this->sort}";
$rs = $this->db->query($sql);
return $rs->fetchAll();
}
+ //获取专题数据的文献
+ public function fetchThemeReferences($code)
+ {
+ $wheresql = array();
+ $wheresql[] = " s.code='$code' ";
+ if(!empty($this->keyword))
+ {
+ $wheresql[] = " (ref.title LIKE '%{$this->keyword}%' OR ref.reference LIKE '%{$this->keyword}%') ";
+ }
+ if(count($wheresql)>0)
+ {
+ $wheresql = " WHERE ".join(" AND ",$wheresql);
+ }else{
+ $wheresql = "";
+ }
+
+ if(empty($this->order))
+ {
+ $order = "ref.year,ref.title";
+ }else{
+ $order = "ref.{$this->order} {$this->sort}";
+ }
+
+ $sql="select distinct ref.* from mdref r left join {$this->table->reference} ref on r.refid=ref.id
+ left join datasource ds on r.uuid=ds.uuid left join {$this->table->source} s on s.id=ds.sourceid
+ $wheresql
+ ORDER BY $order";
+ $rs=$this->db->query($sql);
+ return $rs->fetchAll();
+ }
+
//单条文献的信息
public function getOneReferenceData($id)
{
@@ -162,13 +236,119 @@ class Reference
$sql = "SELECT * FROM {$this->table->reference} WHERE id=$id LIMIT 1";
$rs = $this->db->query($sql);
$row = $rs->fetch();
+ if ($row['attid'])
+ {
+ $files = new Files();
+ $attfile = $files->getOne($row['attid']);
- $files = new Files();
- $attfile = $files->getOne($row['attid']);
-
- $row['file'] = $attfile;
-
+ $row['file'] = $attfile;
+ }
return $row;
}
+
+ //获得reference类型的附件
+ public function getReferenceFiles()
+ {
+ $sql = "SELECT att.*,ref.attid,ref.id as refid FROM {$this->table->attachments} att
+ LEFT JOIN {$this->table->reference} ref ON att.id=ref.attid
+ WHERE att.filetype='literature'";
+ $rs = $this->db->query($sql);
+ $rows = $rs->fetchAll();
+ return $rows;
+ }
+
+ //删除文献
+ public function deleteReference($id,$delete_att = false)
+ {
+ if(empty($id) || !is_numeric($id))
+ {
+ return false;
+ }
+
+ if($delete_att == false)
+ {
+ $sql = "DELETE FROM {$this->table->reference} WHERE id=$id";
+ return $this->db->exec($sql);
+ }else{
+
+ }
+ }
+
+ //建立文献与数据的关系
+ public function createRelationFromReferenceToData($refid,$uuid,$reftype,$place)
+ {
+ if(empty($refid) || is_numeric($refid))
+ {
+ return "参数错误";
+ }
+
+ if(!view::isUuid($uuid))
+ {
+ return "参数错误";
+ }
+
+ $data = array(
+ 'uuid'=>$uuid,
+ 'refid'=>$refid,
+ 'reftype'=>$reftype,
+ 'place'=>$place
+ );
+
+ $dbh = new dbh();
+
+ $id = $dbh->insert($this->table->metadata_reference,$data,true);
+
+ if(is_numeric($id))
+ {
+ return $id;
+ }else{
+ return "关系写入失败，请检查是否已经存在";
+ }
+ }
+
+ //获得某个文献关联的数据 (根据文献获得数据)
+ public function getDataByReference($id)
+ {
+ if(empty($id) || !is_numeric($id))
+ {
+ return "参数错误";
+ }
+
+ $sql = "SELECT mr.reftype,mr.place,md.title,md.uuid FROM {$this->table->metadata_reference} mr
+ LEFT JOIN {$this->table->metadata} md ON mr.uuid=md.uuid
+ WHERE mr.refid=$id";
+
+ $rs = $this->db->query($sql);
+ $rows = $rs->fetchAll();
+ return $rows;
+ }
+
+ //获得某个数据关联的文献 (根据数据获得文献)
+ public function getReferenceByData($uuid)
+ {
+ if(!view::isUuid($uuid))
+ {
+ return "参数错误";
+ }
+
+ $sql = "SELECT mr.reftype,mr.place,md.title,md.uuid FROM {$this->table->metadata_reference} mr
+ LEFT JOIN {$this->table->metadata} md
+ WHERE mr.uuid = $uuid";
+
+ $rs = $this->db->query($sql);
+ $rows = $rs->fetchAll();
+ return $rows;
+ }
+
+ //文献类型
+ public function referenceType()
+ {
+ return array(
+ 1 => '作者文献',
+ 2 => '施引文献',
+ 3 => '参考文献',
+ 4 => '多篇文献'
+ );
+ }
-}
\ No newline at end of file
+}