info['title'] ?> 查看元数据
diff --git a/application/module/Westdc/Dataimport/AbstractProcessing.php b/application/module/Westdc/Dataimport/AbstractProcessing.php
index 135a9d37..6153121c 100644
--- a/application/module/Westdc/Dataimport/AbstractProcessing.php
+++ b/application/module/Westdc/Dataimport/AbstractProcessing.php
@@ -22,13 +22,14 @@ abstract class AbstractProcessing {
switch ($pgsql_data_type){
case "integer":
case "bigint":
- case "int2vector":
case "real":
case "double precision":
return is_int($data) || is_float($data);
case "date":
+ case "timestamp without time zone":
case "char":
case "character varying":
+ case "text":
return is_string($data);
default:
diff --git a/application/module/Westdc/Dataimport/Processing/Csv.php b/application/module/Westdc/Dataimport/Processing/Csv.php
index b1c65f5c..2db91d4b 100644
--- a/application/module/Westdc/Dataimport/Processing/Csv.php
+++ b/application/module/Westdc/Dataimport/Processing/Csv.php
@@ -18,8 +18,8 @@ class Csv extends AbstractProcessing implements ProcessingInterface{
private $csv_object;
private $csv_line_data;
- const ERROR_INDEX_NOT_MATCHED = "值的个数于其它行不匹配";
- const ERROR_INDEX_TYPE_DIFFERENT = "值的类型于上一行不同";
+ const ERROR_INDEX_NOT_MATCHED = "值的个数与其它行不匹配";
+ const ERROR_INDEX_TYPE_DIFFERENT = "值的类型与上一行不同";
const ERROR_EMPTY_FILE = "文件是空的";
const ERROR_LINE_TITLE = "行:";
const ERROR_COLUMN_TITLE = "列:";
@@ -108,6 +108,19 @@ class Csv extends AbstractProcessing implements ProcessingInterface{
return $this->csv_object;
}
+ /**
+ * 面向数据库字段的类型判断
+ * @return bool
+ */
+ private function typeCompare($var1,$var2)
+ {
+ $t1=gettype($var1);
+ $t2=gettype($var2);
+ if ($t1==$t2) return true;
+ if (($t1=='integer' || $t1=='double') && ($t2=='integer' || $t2=='double'))
+ return true;
+ return false;
+ }
/**
* 檢查文件內容是否規則
* @return array|bool
@@ -132,7 +145,7 @@ class Csv extends AbstractProcessing implements ProcessingInterface{
}
foreach($v as $vIndex => $item){
- if(gettype($item) != gettype($lines[$k-1][$vIndex]))
+ if(!$this->typeCompare($item,$lines[$k-1][$vIndex]))
{
$error_stack[] = self::ERROR_LINE_TITLE . ($k + 1) .":".self::ERROR_INDEX_TYPE_DIFFERENT;
}
@@ -158,14 +171,14 @@ class Csv extends AbstractProcessing implements ProcessingInterface{
$first_line = $this->getLines()[0];
- foreach($fields as $index => $field)
+ $index=0;
+ foreach($fields as $field)
{
- $func = $this->checkFieldsDataType($field['data_type'],$first_line[$index]);
-
- if($func)
- continue;
- else
+ if (!$this->checkFieldsDataType($field['data_type'],$first_line[$index]))
+ {
$error_stack[] = self::ERROR_COLUMN_TITLE . $index .":" . self::ERROR_DATA_TYPE_NOT_MATCHED;
+ }
+ $index++;
}
if(count($error_stack) < 1)
@@ -176,7 +189,7 @@ class Csv extends AbstractProcessing implements ProcessingInterface{
}
- public function import($table)
+ public function import($table,$withid=fasle)
{
$config = \Zend_Registry::get('config');
$db = new PDO([
@@ -200,7 +213,10 @@ class Csv extends AbstractProcessing implements ProcessingInterface{
$place_holder[] = "?";
}
- $sth = $db->prepare("INSERT INTO $table VALUES (".join(",",$place_holder).")");
+ if ($withid)
+ $sth = $db->prepare("INSERT INTO $table VALUES (default,".join(",",$place_holder).")");
+ else
+ $sth = $db->prepare("INSERT INTO $table VALUES (".join(",",$place_holder).")");
foreach($this->getLines() as $line)
{