diff --git a/application/common.php b/application/common.php index b56109e..5bf67bf 100644 --- a/application/common.php +++ b/application/common.php @@ -251,7 +251,7 @@ function getAuthor($article) { } -function pushSFTPForScopus($file,$pdf_file) +function pushSFTPForScopus($file,$pdf_file,$stage_info) { $host = 'sftp-opsbank2.elsevier.com'; $port = 22; // SFTP 默认端口号 @@ -270,21 +270,27 @@ function pushSFTPForScopus($file,$pdf_file) // print_r($fileList); // 上传文件到 SFTP 服务器 +// if($stage_info !=null){ +// $bb = '/data/incoming/tmr/'.$stage_info['stage_year']."tmr-".$stage_info['stage_vol']."-".$stage_info['stage_no']."/"; +// }else{ + $bb = '/data/incoming/tmr/'; +// } $localFile = ROOT_PATH."public/articleXML/".$file; - $remoteFile = '/data/incoming/tmr/'.$file; + $remoteFile = $bb.$stage_info['stage_year']."v".$stage_info['stage_vol']."n".$stage_info['stage_no']."-".$file; $res = $sftp->put($remoteFile, $localFile, SFTP::SOURCE_LOCAL_FILE); //上传pdf $localPdf = ROOT_PATH."public/articlePDF/".$pdf_file; - $remoteFilePdf = "/data/incoming/tmr/".str_replace(".xml",".pdf",$file); + $remoteFilePdf = $bb.$stage_info['stage_year']."v".$stage_info['stage_vol']."n".$stage_info['stage_no']."-".str_replace(".xml",".pdf",$file); $res1 = $sftp->put($remoteFilePdf,$localPdf,SFTP::SOURCE_LOCAL_FILE); if ($res&$res1) { echo "文件上传成功!"; } else { - var_dump($sftp); +// echo $sftp->getErrors(); + var_dump($sftp->getErrors()); // return $sftp; } } diff --git a/application/master/controller/Datebase.php b/application/master/controller/Datebase.php index 4d9dce5..5e6cf40 100644 --- a/application/master/controller/Datebase.php +++ b/application/master/controller/Datebase.php @@ -326,10 +326,12 @@ class Datebase extends Controller //pub-date $stage_info = $this->journal_stage_obj->where("journal_stage_id",$article_info['journal_stage_id'])->find(); - $pubDate = $articleMeta->addChild("pub_date"); - $pub_date_list = explode(" ",$article_info['pub_date']); - $pubDate->addChild("year",$pub_date_list[2]); - $pubDate->addChild("month",$pub_date_list[1]); + if($article_info['pub_date']!=""){ + $pubDate = $articleMeta->addChild("pub_date"); + $pub_date_list = explode(" ",$article_info['pub_date']); + $pubDate->addChild("year",$pub_date_list[2]); + $pubDate->addChild("month",$pub_date_list[1]); + } $vol = $articleMeta->addChild("volume",$stage_info['stage_vol']); $vol->addAttribute("content-type","Vol."); $issue = $articleMeta->addChild("issue",$article_info['npp']); @@ -436,11 +438,12 @@ class Datebase extends Controller public function scopusPushXML($stage_id){ $list = $this->article_obj->where("journal_stage_id",$stage_id)->where("state",0)->select(); + $stage_info = $this->journal_stage_obj->where("journal_stage_id",$stage_id)->find(); foreach ($list as $v){ $this->xmlCreateForArticle($v['article_id']); $file = substr($v['doi'],strpos($v['doi'],"/")+1).".xml"; - pushSFTPForScopus($file,$v['file_pdf']); + pushSFTPForScopus($file,$v['file_pdf'],$stage_info); } }