-
数据施引文献库
+
数据施引文献库
+ md) :
+ echo '
';
+ endif;
+ ?>
paginator)): ?>
diff --git a/application/default/views/scripts/water/view.phtml b/application/default/views/scripts/water/view.phtml
index db5ab149..a548d2bb 100755
--- a/application/default/views/scripts/water/view.phtml
+++ b/application/default/views/scripts/water/view.phtml
@@ -101,6 +101,10 @@ h3.gs_rt{font-size:110%;}
}
echo "";
endforeach;
+ if (count($this->userref)==15)
+ {
+ echo '更多施引文献';
+ }
?>
diff --git a/application/module/Helpers/Curl.php b/application/module/Helpers/Curl.php
index bc819575..dea71661 100644
--- a/application/module/Helpers/Curl.php
+++ b/application/module/Helpers/Curl.php
@@ -16,6 +16,8 @@ class Curl
'verifyssl' => true,
), $options);
}
+
+ public $H;
/**
* Send a request to the server, receive a response
@@ -69,6 +71,11 @@ class Curl
} else {
$headers[] = 'Content-Length: 0';
}
+
+ if(!empty($this->H) && is_array($this->H) && count($this->H) > 0)
+ {
+ $headers = array_merge($headers,$this->H);
+ }
$this->debug('send '.$httpMethod.' request: '.$url);
diff --git a/application/module/Reference/Handler/RisHandler.php b/application/module/Reference/Handler/RisHandler.php
index 9de4d5d0..8a820795 100644
--- a/application/module/Reference/Handler/RisHandler.php
+++ b/application/module/Reference/Handler/RisHandler.php
@@ -36,9 +36,14 @@ class RisHandler implements \Reference\Event\RisEvent
$wheresql = array();
+ if(preg_match("/\'/",$ref['title']))
+ {
+ $ref['title'] = preg_replace("/\'/","''",$ref['title']);
+ }
+
$wheresql[] = " lower(title)=lower('{$ref['title']}') ";
$wheresql[] = " year='{$ref['year']}' ";
-
+
//暂时不使用期刊限制
/*if(isset($ref['publisher']))
{
diff --git a/application/module/Reference/Ris.php b/application/module/Reference/Ris.php
index 7e30ef73..72da0dc3 100644
--- a/application/module/Reference/Ris.php
+++ b/application/module/Reference/Ris.php
@@ -277,7 +277,13 @@ class Ris
//创建reference 字段
public function makeReferenceFlag($ref){
- $str = join(', ',$ref['author']).'. ';
+ $str='';
+ if(is_array($ref['author']) && count($ref['author']) > 0)
+ {
+ $str .= join(', ',$ref['author']).'. ';
+ } else if (is_string($ref['author'])) {
+ $str .= $ref['author'].'. ';
+ }
$str .= $ref['title'].'. ';
$str .= $ref['publisher'].', ';
isset($ref['year']) ? $str .= $ref['year'].', ':"";