Merge remote-tracking branch 'origin/master'

Author: Dmitriy "DK" Korobskiy

Analysis/affymetrix/garfield_import_dmet_twog.sql

@@ -59,15 +59,16 @@ FROM garfield_dmet_begin a INNER JOIN wos_references b ON a.target=b.source_id;
 -- Inner join on wos_pubs to get only viable references (complete WoS Ids)
 DROP TABLE IF EXISTS garfield_dmet_twog;
 CREATE TABLE garfield_dmet_twog AS
-SELECT a.* FROM garfield_dmet_twog_a INNER JOIN
-wos_publications_b ON a.target=b.source_id;
+SELECT a.* FROM garfield_dmet_twog_a a INNER JOIN
+wos_publications b ON a.target=b.source_id;
 
 -- begin node list assembly process.
 DROP TABLE IF EXISTS garfield_node_assembly;
 CREATE TABLE  garfield_node_assembly(node_id varchar(16),
 node_name varchar(19),stype varchar(10),ttype varchar(10));
 
 --build node_table
+-- insert from end point 
 --gen1
 INSERT INTO garfield_node_assembly(node_id,node_name,stype) 
 SELECT DISTINCT 'n'||substring(source,5),source,stype
@@ -86,14 +87,24 @@ INSERT INTO garfield_node_assembly(node_id,node_name,ttype)
 SELECT DISTINCT 'n'||substring(target,5),target,ttype
 FROM garfield_gen2;
 
---garfield_dmet_begin
+-- insert from start point (dmet plus)
+-- garfield_dmet_begin
 INSERT INTO garfield_node_assembly(node_id,node_name,stype) 
 SELECT DISTINCT 'n'||substring(source,5),source,stype
 FROM garfield_dmet_begin;
 
 INSERT INTO garfield_node_assembly(node_id,node_name,ttype) 
 SELECT DISTINCT 'n'||substring(target,5),target,ttype
 FROM garfield_dmet_begin;
+
+-- gen1_cited
+INSERT INTO garfield_node_assembly(node_id,node_name,ttype) 
+SELECT DISTINCT 'n'||substring(source,5),source,stype
+FROM garfield_dmet_twog;
+
+INSERT INTO garfield_node_assembly(node_id,node_name,ttype) 
+SELECT DISTINCT 'n'||substring(target,5),target,ttype
+FROM garfield_dmet_twog;
 CREATE INDEX garfield_node_assembly_idx ON garfield_node_assembly(node_id);
 
 DROP TABLE IF EXISTS garfield_nodelist;
@@ -116,6 +127,10 @@ FROM garfield_gen2;
 INSERT INTO garfield_edge_table SELECT 'n'||substring(source,5) AS snid,
 'n'||substring(target,5) as tnid, source, target, stype, ttype
 FROM garfield_dmet_begin;
+
+INSERT INTO garfield_edge_table SELECT 'n'||substring(source,5) AS snid,
+'n'||substring(target,5) as tnid, source, target, stype, ttype
+FROM garfield_dmet_twog;
 CREATE INDEX garfield_edge_table_idx ON garfield_edge_table(snid,tnid);
 
 DROP TABLE IF EXISTS garfield_edgelist;
@@ -143,23 +158,6 @@ CREATE TABLE garfield_nodelist_formatted_b_pmid AS
 SELECT a.*,b.pmid_int FROM garfield_nodelist_formatted_b a 
 LEFT JOIN wos_pmid_mapping b ON a.node_name=b.wos_id;
 
-/*
-DROP TABLE IF EXISTS garfield_nodelist_formatted_b_pmid_grants;
-CREATE TABLE garfield_nodelist_formatted_b_pmid_grants AS
-SELECT a.*,b.project_number FROM garfield_nodelist_formatted_b_pmid a
-LEFT JOIN exporter_publink b ON a.pmid_int=b.pmid::int;
-
-ALTER TABLE garfield_nodelist_formatted_b_pmid_grants ADD COLUMN ic varchar(2);
-ALTER TABLE garfield_nodelist_formatted_b_pmid_grants ADD COLUMN nida varchar(10);
-ALTER TABLE garfield_nodelist_formatted_b_pmid_grants ADD COLUMN other_nih varchar(10);
-
-UPDATE garfield_nodelist_formatted_b_pmid_grants SET ic=substring(project_number,4,2);
-UPDATE garfield_nodelist_formatted_b_pmid_grants SET nida='1' WHERE ic='DA';
-UPDATE garfield_nodelist_formatted_b_pmid_grants SET nida='0' WHERE nida IS NULL;
-UPDATE garfield_nodelist_formatted_b_pmid_grants SET other_nih='1' WHERE ic IS NOT NULL AND nida='0';
-UPDATE garfield_nodelist_formatted_b_pmid_grants SET other_nih='0' WHERE other_nih IS NULL;
-*/
-
 DROP TABLE IF EXISTS garfield_nodelist_formatted_b_pmid_grants;
 CREATE TABLE garfield_nodelist_formatted_b_pmid_grants AS
 SELECT
@@ -218,10 +216,11 @@ COPY (
     publication_year AS "publication_year:int",
     total_citation_count AS "total_citations:int"
   FROM chackoge.garfield_nodelist_final_citation
-) TO '/tmp/garfield_nodelist_final.csv' WITH (FORMAT CSV, HEADER);
+) TO '/tmp/garfield_nodelist_2g_final.csv' WITH (FORMAT CSV, HEADER);
 
 COPY (
   SELECT source AS ":START_ID",
     target AS ":END_ID"
   FROM chackoge.garfield_edgelist
-) TO '/tmp/garfield_edgelist_final.csv' WITH (FORMAT CSV, HEADER);
+) TO '/tmp/garfield_edgelist_2g_final.csv' WITH (FORMAT CSV, HEADER);
+