diff --git a/application/default/controllers/HeiheController.php b/application/default/controllers/HeiheController.php
index 8b1b8c9a..39fd0475 100644
--- a/application/default/controllers/HeiheController.php
+++ b/application/default/controllers/HeiheController.php
@@ -11,7 +11,7 @@ class HeiheController extends DataController
 		
 	function indexAction()
 	{
-		$sql="select m.uuid,m.title,m.id,m.description from normalmetadata m left join thumbnail t on m.id=t.id where m.source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80' and length(t.data)>2 order by random() limit 3";
+		$sql="select m.uuid,m.title,m.id,m.description from normalmetadata m left join thumbnail t on m.id=t.id where m.uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe')  and length(t.data)>2 order by random() limit 3";
 		$this->view->meatdata=$this->db->fetchAll($sql);		
 	}
 
@@ -23,11 +23,11 @@ class HeiheController extends DataController
     	$page=(int)$this->_request->getParam('page');    	
     	if (empty($page)) $page=1;
     	$offset=$this->limit*($page-1);
-    	$state=$this->db->query("select count(*) from metadata where source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80'");
+    	$state=$this->db->query("select count(*) from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe') ");
     	$row=$state->fetchAll();
     	$sum=$row[0]['count'];
     	$select=$this->db->select();
-    	$select->from('metadata','*')->where("source=?",'e3ad32dc-f573-11e0-aa7b-b768cfd88d80')->order('title desc')->limitPage($page,$this->limit);
+    	$select->from('normalmetadata','*')->where(" uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe') ")->order('title desc')->limitPage($page,$this->limit);
     	$this->view->metadata = $this->db->fetchAll($select);
     	$this->view->page=new Pagination($sum,$page,$this->limit);
     	$this->view->offset=$offset+1; 
@@ -38,14 +38,12 @@ class HeiheController extends DataController
     	$page=(int)$this->_request->getParam('page');    	
     	if (empty($page)) $page=1;
     	$offset=$this->limit*($page-1);
-    	$state=$this->db->query("select count(*) from normalmetadata where source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80'");
+    	$state=$this->db->query("select count(*) from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe') ");
     	$row=$state->fetchAll();
     	$sum=$row[0]['count'];
     	$select=$this->db->select();
     	$select->from('normalmetadata as m','m.*')
-	    	->joinLeft('geonetworkmetadata as g','g.uuid=m.uuid','g.id as gid')
-	    	->joinLeft('thumbnail as t','t.id=m.id','t.filename')
-   	 	->where("m.source=?",'e3ad32dc-f573-11e0-aa7b-b768cfd88d80')
+   	 	->where(" uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe') ")
    	 	->order('m.title desc')->limitPage($page,$this->limit);
     	$this->view->metadata = $this->db->fetchAll($select);
     	$this->view->page=new Pagination($sum,$page,$this->limit);
@@ -56,9 +54,9 @@ class HeiheController extends DataController
     	$page=(int)$this->_request->getParam('page');    	
     	if (empty($page)) $page=1;
     	$offset=$this->limit*($page-1);
-    	$row=$this->db->fetchAll("select count(*) from reference where id in (select refid from mdref where uuid in (select uuid from metadata where source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80'))");
+    	$row=$this->db->fetchAll("select count(*) from reference where id in (select refid from mdref where uuid in (select uuid from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe') ))");
     	$sum=$row[0]['count'];
-		$sql="select * from reference where id in (select refid from mdref where uuid in (select uuid from metadata where source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80')) order by reference limit ? offset ?";
+		$sql="select * from reference where id in (select refid from mdref where uuid in (select uuid from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe') )) order by reference limit ? offset ?";
 		$this->view->refs=$this->db->fetchAll($sql,array($this->limit,$offset));
     	$this->view->page=new Pagination($sum,$page,$this->limit,"文献");
     	$this->view->offset=$offset+1; 	
@@ -69,10 +67,10 @@ class HeiheController extends DataController
     	$page=(int)$this->_request->getParam('page');    	
     	if (empty($page)) $page=1;
     	$offset=$this->limit*($page-1);
-    	$state=$this->db->query("select count(*) from metadata where source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80' and id in (select id from keyword where keytype='theme' and (keyword='冰川' or keyword='沙漠' or keyword='地貌' or keyword='植被' or keyword='草场' or keyword='沙漠化' or keyword='基础地理' or keyword='遥感影像' or keyword='水文地质' or keyword='社会经济' or keyword='人口' or keyword='SWAT' or keyword='NPP' or keyword='WRF' or keyword='辐射' or keyword='NEP'))");
+    	$state=$this->db->query("select count(*) from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe')  and id in (select id from keyword where keytype='theme' and (keyword='冰川' or keyword='沙漠' or keyword='地貌' or keyword='植被' or keyword='草场' or keyword='沙漠化' or keyword='基础地理' or keyword='遥感影像' or keyword='水文地质' or keyword='社会经济' or keyword='人口' or keyword='SWAT' or keyword='NPP' or keyword='WRF' or keyword='辐射' or keyword='NEP'))");
     	$row=$state->fetchAll();
     	$sum=$row[0]['count'];
-		$sql="select uuid,title from metadata where source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80' and id in (select id from keyword where keytype='theme' and (keyword='冰川' or keyword='沙漠' or keyword='地貌' or keyword='植被' or keyword='草场' or keyword='沙漠化' or keyword='基础地理' or keyword='遥感影像' or keyword='水文地质' or keyword='社会经济' or keyword='人口' or keyword='SWAT' or keyword='NPP' or keyword='WRF' or keyword='辐射' or keyword='NEP')) order by timebegin,title limit ? offset ?";
+		$sql="select uuid,title from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe')  and id in (select id from keyword where keytype='theme' and (keyword='冰川' or keyword='沙漠' or keyword='地貌' or keyword='植被' or keyword='草场' or keyword='沙漠化' or keyword='基础地理' or keyword='遥感影像' or keyword='水文地质' or keyword='社会经济' or keyword='人口' or keyword='SWAT' or keyword='NPP' or keyword='WRF' or keyword='辐射' or keyword='NEP')) order by timebegin,title limit ? offset ?";
 		$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
     	$this->view->page=new Pagination($sum,$page,$this->limit);
     	$this->view->offset=$offset+1; 			
@@ -88,10 +86,10 @@ class HeiheController extends DataController
     	$page=(int)$this->_request->getParam('page');    	
     	if (empty($page)) $page=1;
     	$offset=$this->limit*($page-1);
-    	$state=$this->db->query("select count(*) from metadata where source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80' and id in (select id from keyword where keytype='theme' and (keyword='DEM' or keyword='土地利用' or keyword='土壤' or keyword='气象' or keyword='水文观测' or keyword='灌溉' or keyword='试验'))");
+    	$state=$this->db->query("select count(*) from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe')  and id in (select id from keyword where keytype='theme' and (keyword='DEM' or keyword='土地利用' or keyword='土壤' or keyword='气象' or keyword='水文观测' or keyword='灌溉' or keyword='试验'))");
     	$row=$state->fetchAll();
     	$sum=$row[0]['count'];
-		$sql="select uuid,title from metadata where source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80' and id in (select id from keyword where keytype='theme' and (keyword='DEM' or keyword='土地利用' or keyword='土壤' or keyword='气象' or keyword='水文观测' or keyword='灌溉' or keyword='试验')) order by timebegin,title limit ? offset ?";
+		$sql="select uuid,title from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe')  and id in (select id from keyword where keytype='theme' and (keyword='DEM' or keyword='土地利用' or keyword='土壤' or keyword='气象' or keyword='水文观测' or keyword='灌溉' or keyword='试验')) order by timebegin,title limit ? offset ?";
 		$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
     	$this->view->page=new Pagination($sum,$page,$this->limit);
     	$this->view->offset=$offset+1; 	
@@ -117,10 +115,10 @@ class HeiheController extends DataController
     	$page=(int)$this->_request->getParam('page');    	
     	if (empty($page)) $page=1;
     	$offset=$this->limit*($page-1);
-    	$state=$this->db->query("select count(*) from metadata where source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80' and id in (select id from keyword where keytype='theme' and (keyword='WRF' or keyword='NPP' or keyword='SWAT' or keyword='NEP' or keyword='辐射'))");
+    	$state=$this->db->query("select count(*) from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe')  and id in (select id from keyword where keytype='theme' and (keyword='WRF' or keyword='NPP' or keyword='SWAT' or keyword='NEP' or keyword='辐射'))");
     	$row=$state->fetchAll();
     	$sum=$row[0]['count'];
-		$sql="select uuid,title from metadata where source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80' and id in (select id from keyword where keytype='theme' and (keyword='WRF' or keyword='NPP' or keyword='SWAT' or keyword='NEP' or keyword='辐射')) order by timebegin,title limit ? offset ?";
+		$sql="select uuid,title from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe')  and id in (select id from keyword where keytype='theme' and (keyword='WRF' or keyword='NPP' or keyword='SWAT' or keyword='NEP' or keyword='辐射')) order by timebegin,title limit ? offset ?";
 		$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
     	$this->view->page=new Pagination($sum,$page,$this->limit);
     	$this->view->offset=$offset+1; 	
@@ -131,10 +129,10 @@ class HeiheController extends DataController
     	$page=(int)$this->_request->getParam('page');    	
     	if (empty($page)) $page=1;
     	$offset=$this->limit*($page-1);
-    	$state=$this->db->query("select count(*) from metadata where source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80' and id in (select id from keyword where keytype='theme' and (keyword='人口' or keyword='社会经济'))");
+    	$state=$this->db->query("select count(*) from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe')  and id in (select id from keyword where keytype='theme' and (keyword='人口' or keyword='社会经济'))");
     	$row=$state->fetchAll();
     	$sum=$row[0]['count'];
-		$sql="select uuid,title from metadata where source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80' and id in (select id from keyword where keytype='theme' and (keyword='人口' or keyword='社会经济')) order by timebegin,title limit ? offset ?";
+		$sql="select uuid,title from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe')  and id in (select id from keyword where keytype='theme' and (keyword='人口' or keyword='社会经济')) order by timebegin,title limit ? offset ?";
 		$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
     	$this->view->page=new Pagination($sum,$page,$this->limit);
     	$this->view->offset=$offset+1; 
@@ -145,10 +143,10 @@ class HeiheController extends DataController
     	$page=(int)$this->_request->getParam('page');    	
     	if (empty($page)) $page=1;
     	$offset=$this->limit*($page-1);
-    	$state=$this->db->query("select count(*) from metadata where source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80' and id in (select id from keyword where keytype='theme' and (keyword='冰川' or keyword='沙漠' or keyword='地貌' or keyword='植被' or keyword='草场' or keyword='沙漠化'))");
+    	$state=$this->db->query("select count(*) from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe')  and id in (select id from keyword where keytype='theme' and (keyword='冰川' or keyword='沙漠' or keyword='地貌' or keyword='植被' or keyword='草场' or keyword='沙漠化'))");
     	$row=$state->fetchAll();
     	$sum=$row[0]['count'];
-		$sql="select uuid,title from metadata where source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80' and id in (select id from keyword where keytype='theme' and (keyword='冰川' or keyword='沙漠' or keyword='地貌' or keyword='植被' or keyword='草场' or keyword='沙漠化')) order by timebegin,title limit ? offset ?";
+		$sql="select uuid,title from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe')  and id in (select id from keyword where keytype='theme' and (keyword='冰川' or keyword='沙漠' or keyword='地貌' or keyword='植被' or keyword='草场' or keyword='沙漠化')) order by timebegin,title limit ? offset ?";
 		$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
     	$this->view->page=new Pagination($sum,$page,$this->limit);
     	$this->view->offset=$offset+1; 	
@@ -183,9 +181,9 @@ class HeiheController extends DataController
 		$this->getmd('试验','theme');
 	}
 
-	function docAction()
+	function listAction()
 	{
-		$sql="select uuid,title from metadata where source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80' order by timebegin,title";
+		$sql="select uuid,title from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe')  order by timebegin,title";
 		$this->view->metadata=$this->db->fetchAll($sql);
 	}
 
@@ -201,19 +199,19 @@ class HeiheController extends DataController
     		$state=$this->db->query($sql);
     		$row=$state->fetchAll();
 			$sum=$row[0]['count'];
-			$sql="select uuid,title,id,description from metadata where source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80' and id in (select id from keyword where keyword='".$key."') order by timebegin,title limit ? offset ?";
+			$sql="select uuid,title,id,description from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe')  and id in (select id from keyword where keyword='".$key."') order by timebegin,title limit ? offset ?";
 			$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
     		$this->view->page=new Pagination($sum,$page,$this->limit);
     	} else {
-    		$state=$this->db->query("select keyword.keyword,count(*) from keyword left join metadata on keyword.id=metadata.id where keyword.keytype='place' and metadata.source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80' group by keyword.keyword order by count desc");    	
+    		$state=$this->db->query("select keyword.keyword,count(*) from keyword left join normalmetadata m on keyword.id=m.id where keyword.keytype='place' and m.uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe')  group by keyword.keyword order by count desc");    	
     		$k1=$state->fetchAll();
-    		$state=$this->db->query("select k.keyword,count(k.keyword) from keyword k left join metadata m on k.id=m.id where k.keytype='theme' and m.source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80'  group by k.keyword order by k.keyword");
+    		$state=$this->db->query("select k.keyword,count(k.keyword) from keyword k left join normalmetadata m on k.id=m.id where k.keytype='theme' and m.uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe')   group by k.keyword order by k.keyword");
     		$k2=$state->fetchAll();
-    		$state=$this->db->query("select k.keyword,count(k.keyword) from keyword k left join metadata m on k.id=m.id where k.keytype='discipline' and m.source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80'  group by k.keyword order by k.keyword");
+    		$state=$this->db->query("select k.keyword,count(k.keyword) from keyword k left join normalmetadata m on k.id=m.id where k.keytype='discipline' and m.uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe')   group by k.keyword order by k.keyword");
     		$k3=$state->fetchAll();
-    		$state=$this->db->query("select k.keyword,count(k.keyword) from keyword k left join metadata m on k.id=m.id where k.keytype='stratum' and m.source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80'  group by k.keyword order by k.keyword");
+    		$state=$this->db->query("select k.keyword,count(k.keyword) from keyword k left join normalmetadata m on k.id=m.id where k.keytype='stratum' and m.uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe')   group by k.keyword order by k.keyword");
     		$k4=$state->fetchAll();
-    		$state=$this->db->query("select keyword.keyword,count(*) from keyword left join metadata on keyword.id=metadata.id where keyword.keytype='temporal' and metadata.source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80' group by keyword.keyword order by keyword.keyword");
+    		$state=$this->db->query("select keyword.keyword,count(*) from keyword left join normalmetadata m on keyword.id=m.id where keyword.keytype='temporal' and m.uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe')  group by keyword.keyword order by keyword.keyword");
     		$k5=$state->fetchAll();
     		$this->view->keywords=array('place'=>$k1,'theme'=>$k2,'discipline'=>$k3,'stratum'=>$k4,'temporal'=>$k5);    	
     	}
@@ -232,9 +230,9 @@ class HeiheController extends DataController
     		$page=@(int)$this->_request->getParam('page');
     		if (empty($page)) $page=1;
     		$offset=$this->limit*($page-1);
-    		$row=$this->db->fetchAll("select count(*) from metadata where source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80' and ".$where);
+    		$row=$this->db->fetchAll("select count(*) from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe')  and ".$where);
     		$sum=$row[0]['count'];
-    		$sql="select uuid,title,id,description from metadata where source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80' and ".$where." order by timebegin,title limit ? offset ?";
+    		$sql="select uuid,title,id,description from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe')  and ".$where." order by timebegin,title limit ? offset ?";
 			$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
     		$this->view->page=new Pagination($sum,$page,$this->limit);
     		$this->view->key=$key;
@@ -244,19 +242,19 @@ class HeiheController extends DataController
 
 	function timemapAction()
 	{
-    	$sql="select id,uuid,west,south,north,east,title,timebegin,timeend from metadata where source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80' and timebegin is not null";
+    	$sql="select id,uuid,west,south,north,east,title,timebegin,timeend from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe') and timebegin is not null";
     	$this->view->rows=$this->db->fetchAll($sql);
 	}
     
    function timelineAction()
    {
     	$fn="heihetime.xml";
-    	$rows=$this->db->fetchAll("select ts_created from metadata where source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80' order by ts_created desc limit 1");
+    	$rows=$this->db->fetchAll("select ts_created from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe') order by ts_created desc limit 1");
     	$last_update=strtotime($rows[0]['ts_created']);
     	if (!file_exists($fn) || (filemtime($fn)<$last_update))
     	{ 
 	    	$dateformat="M j Y";
-   	 	$rows=$this->db->fetchAll("select id,uuid,description,title,timebegin,timeend from metadata where source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80' and timebegin is not null order by timebegin,title");
+   	 	$rows=$this->db->fetchAll("select id,uuid,description,title,timebegin,timeend from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe') and timebegin is not null order by timebegin,title");
     		$timexml='<data>';
     		foreach($rows as $row) {
     			$timexml.='<event start="'.date($dateformat,strtotime($row['timebegin'])).' GMT+0800" ';
@@ -281,11 +279,11 @@ class HeiheController extends DataController
     	$page=(int)$this->_request->getParam('page');    	
     	if (empty($page)) $page=1;
     	$offset=$this->limit*($page-1);
-    	$this->view->category=$this->db->fetchAll("select c.code,name,name_zh,count(*) from category c left join metadata m on c.id=m.id,categorycode cc where c.code=cc.code and m.source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80' group by c.code,cc.name,cc.name_zh");
+    	$this->view->category=$this->db->fetchAll("select c.code,name,name_zh,count(*) from category c left join normalmetadata m on c.id=m.id,categorycode cc where c.code=cc.code and  m.uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe') group by c.code,cc.name,cc.name_zh");
     	if ($code>0 && $code<20) {
-			$row=$this->db->fetchAll("select count(*) from metadata where source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80' and id in (select id from category where code=".$code.")");
+			$row=$this->db->fetchAll("select count(*) from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe') and id in (select id from category where code=".$code.")");
 			$sum=$row[0]['count'];
-			$sql="select uuid,title,description,id from metadata where source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80' and id in (select distinct id from category where code=".$code.") order by timebegin,title limit ? offset ?";
+			$sql="select uuid,title,description,id from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe') and id in (select distinct id from category where code=".$code.") order by timebegin,title limit ? offset ?";
 			$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
     		$this->view->page=new Pagination($sum,$page,$this->limit);
     		$this->view->offset=$offset+1; 
@@ -301,11 +299,11 @@ class HeiheController extends DataController
     	$page=(int)$this->_request->getParam('page');    	
     	if (empty($page)) $page=1;
     	$offset=$this->limit*($page-1);
-    	$state=$this->db->query("select count(*) from metadata where source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80' and id in (select id from keyword where keytype='".$type."' and keyword='".$keyword."')");
+    	$state=$this->db->query("select count(m.*) from normalmetadata m left join datasource d on m.uuid=d.uuid left join source s on d.sourceid=s.id where s.code='heihe' and m.id in (select id from keyword where keytype='".$type."' and keyword='".$keyword."')");
     	$row=$state->fetchAll();
     	$sum=$row[0]['count'];
     	//@todo: add order with title
-		$sql="select uuid,title from metadata where source='e3ad32dc-f573-11e0-aa7b-b768cfd88d80' and id in (select id from keyword where keytype='".$type."' and keyword='".$keyword."') order by timebegin,title limit ? offset ?";
+		$sql="select uuid,title from normalmetadata where uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe') and id in (select id from keyword where keytype='".$type."' and keyword='".$keyword."') order by timebegin,title limit ? offset ?";
 		$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
     	$this->view->page=new Pagination($sum,$page,$this->limit);
     	$this->view->offset=$offset+1;