Project

General

Profile

« Previous | Next » 

Revision 52676

Clean up utils/properties/searchFields.ts
Add operator for each parameter
change the way operators were produced: use 1st and 3rd letter if the operator is unique
Change the operator parameter in all pages that have links to advanced search

View differences:

searchFields.ts
1 1
export class SearchFields {
2

  
2 3
    //main Entities
3 4
    //RESULTS
4
    //Used for datasets and publications
5
    //In case Datasets should display  different fields, use seperate tables for fields
5
    //Used for datasets and publications and software
6
    //In case Datasets or Software should display  different fields, use seperate tables for fields
6 7
    public RESULT_REFINE_FIELDS = [
7 8
      "relfunder",
8 9
    "relfundinglevel0_id","relfundinglevel1_id","relfundinglevel2_id",
9 10
    "relproject","resultacceptanceyear",
10 11
   "resultbestaccessright", "instancetypename", "resultlanguagename", "community","resulthostingdatasource"];
11 12

  
12
     public RESULT_ADVANCED_FIELDS:string[] = ["q","resulttitle","resultauthor","resultpublisher","instancetypename",
13
     "resultlanguagename", "community","relprojectid", "relfunder",
13
     public RESULT_ADVANCED_FIELDS:string[] = ["q","resulttitle","resultauthor","resultpublisher",
14
     "resultbestaccessright","community","collectedfromdatasourceid","resulthostingdatasourceid", "resultdateofacceptance",
15
          "relfunder",
14 16
     "relfundinglevel0_id","relfundinglevel1_id","relfundinglevel2_id",
15
     "resultdateofacceptance","resultbestaccessright","pid","resulthostingdatasourceid","collectedfromdatasourceid", "relorganizationid"];
17
     "resultlanguagename", "relorganizationid", "pid","relprojectid", "instancetypename"];
16 18
          public RESULT_FIELDS: { [key:string]:FieldDetails}={
17
           ["q"]:{name:"All fields", type:"keyword", param:"q", equalityOperator: "="},
18
         ["resulttitle"]:{name:"Title", type:"keyword", param:"title", equalityOperator: "="},
19
         ["resultauthor"]:{name:"Author", type:"keyword", param:"author", equalityOperator: "="},
20
         ["resultpublisher"]:{name:"Publisher", type:"keyword", param:"publisher", equalityOperator: "="},
21
         ["pid"]:{name:"PID", type:"keyword", param:"pid", equalityOperator: " = "},
22
         ["resulthostingdatasourceid"]:{name:"Hosting Content Provider", type:"entity", param:"hostedBy", equalityOperator: " exact "},
23
         ["resulthostingdatasource"]:{name:"Content Provider", type:"refine", param:"hostedBy", equalityOperator: " exact "},
24
         ["instancetypename"]:{name:"Type", type:"vocabulary", param:"type", equalityOperator: " exact "},
25
        //  ["instancetypenameid"]:{name:"Type", type:"vocabulary", param:"type", equalityOperator: " exact "},
26
         ["resultlanguagename"]:{name:"Language", type:"vocabulary", param:"lang", equalityOperator: " exact "},
27
        //  ["resultlanguageid"]:{name:"Language", type:"vocabulary", param:"lang", equalityOperator: " exact "},
28
         ["community"]:{name:"Community", type:"refine", param:"community", equalityOperator: " exact "},
29
         ["relproject"]:{name:"Project", type:"refine", param:"project", equalityOperator: " exact "},
30
         ["relprojectid"]:{name:"Project", type:"entity", param:"project", equalityOperator: " exact "},
31
         ["relfunder"]:{name:"Funder", type:"refine", param:"funder", equalityOperator: " exact "},
32
         ["relfundinglevel0_id"]:{name:"Funding Stream", type:"refine", param:"funderlv0", equalityOperator: " exact "},
33
         ["relfundinglevel1_id"]:{name:"Funding Substream level 1", type:"refine", param:"funderlv1", equalityOperator: " exact "},
34
         ["relfundinglevel2_id"]:{name:"Funding Substream level 2", type:"refine", param:"funderlv2", equalityOperator: " exact "},
35
         ["resultacceptanceyear"]:{name:"Publication Date", type:"keyword", param:"year", equalityOperator: " exact "},
36
         ["resultdateofacceptance"]:{name:"Publication Date", type:"date", param:"date", equalityOperator: " within "},
37
         ["resultbestaccessright"]:{name:"Access Mode", type:"vocabulary", param:"access", equalityOperator: " exact "},
38
        //  ["resultbestaccessright"]:{name:"Access Mode", type:"refine", param:"access", equalityOperator: " exact "},
39
         ["collectedfrom"]:{name:"Content Provider", type:"refine", param:"datasource", equalityOperator: " exact "},
40
         ["relorganizationid"]:{name:"Organization", type:"entity", param:"organization", equalityOperator: " exact "},
41
         ["collectedfromdatasourceid"]:{name:"Collected from Content Provider", type:"entity", param:"collectedFrom", equalityOperator: " exact "}
19
           ["q"]:{name:"All fields", type:"keyword", param:"q", operator: "op", equalityOperator: "="},
20
         ["resulttitle"]:{name:"Title", type:"keyword", param:"title", operator: "tt", equalityOperator: "="},
21
         ["resultauthor"]:{name:"Author", type:"keyword", param:"author", operator: "at", equalityOperator: "="},
22
         ["resultpublisher"]:{name:"Publisher", type:"keyword", param:"publisher", operator: "pb", equalityOperator: "="},
23
         ["pid"]:{name:"PID", type:"keyword", param:"pid", operator: "pd", equalityOperator: " = "},
24
         ["resulthostingdatasourceid"]:{name:"Hosting Content Provider", type:"entity", param:"hostedBy", operator: "hs", equalityOperator: " exact "},
25
         ["resulthostingdatasource"]:{name:"Content Provider", type:"refine", param:"hostedBy", operator: "hs", equalityOperator: " exact "},
26
         ["instancetypename"]:{name:"Type", type:"vocabulary", param:"type", operator: "tp", equalityOperator: " exact "},
27
         ["resultlanguagename"]:{name:"Language", type:"vocabulary", param:"lang", operator: "ln", equalityOperator: " exact "},
28
         ["community"]:{name:"Community", type:"refine", param:"community", operator: "cm", equalityOperator: " exact "},
29
         ["relproject"]:{name:"Project", type:"refine", param:"project", operator: "po", equalityOperator: " exact "},
30
         ["relprojectid"]:{name:"Project", type:"entity", param:"project", operator: "po", equalityOperator: " exact "},
31
         ["relfunder"]:{name:"Funder", type:"refine", param:"funder", operator: "fn", equalityOperator: " exact "},
32
         ["relfundinglevel0_id"]:{name:"Funding Stream", type:"refine", param:"funderlv0", operator: "fn0", equalityOperator: " exact "},
33
         ["relfundinglevel1_id"]:{name:"Funding Substream level 1", type:"refine", param:"funderlv1", operator: "fn1", equalityOperator: " exact "},
34
         ["relfundinglevel2_id"]:{name:"Funding Substream level 2", type:"refine", param:"funderlv2", operator: "fn0", equalityOperator: " exact "},
35
         ["resultacceptanceyear"]:{name:"Publication Date", type:"keyword", param:"year", operator: "ya", equalityOperator: " exact "},
36
         ["resultdateofacceptance"]:{name:"Publication Date", type:"date", param:"date", operator: "dt", equalityOperator: " within "},
37
         ["resultbestaccessright"]:{name:"Access Mode", type:"vocabulary", param:"access", operator: "ac", equalityOperator: " exact "},
38
         ["collectedfrom"]:{name:"Content Provider", type:"refine", param:"datasource", operator: "dt", equalityOperator: " exact "},
39
         ["relorganizationid"]:{name:"Organization", type:"entity", param:"organization", operator: "og", equalityOperator: " exact "},
40
         ["collectedfromdatasourceid"]:{name:"Collected from Content Provider", type:"entity", param:"collectedFrom", operator: "cl", equalityOperator: " exact "}
42 41
                };
43 42

  
44 43
      //PROJECT
......
50 49
    "projectstartdate","projectenddate","projectecsc39",
51 50
    "projectcode_nt","relorganizationid", "collectedfromdatasourceid"];
52 51
    public PROJECT_FIELDS: { [key:string]:FieldDetails}={
53
       ["q"]:{name:"All fields", type:"keyword", param:"q", equalityOperator: "="},
54
       ["projectacronym"]:{name:"Acronym", type:"keyword", param:"acronym", equalityOperator: "="},
55
       ["projecttitle"]:{name:"Title", type:"keyword", param:"title", equalityOperator: "="},
56
       ["projectkeywords"]:{name:"Keywords", type:"keyword", param:"keywords", equalityOperator: "="},
52
       ["q"]:{name:"All fields", type:"keyword", param:"q", operator: "op", equalityOperator: "="},
53
       ["projectacronym"]:{name:"Acronym", type:"keyword", param:"acronym", operator: "ar", equalityOperator: "="},
54
       ["projecttitle"]:{name:"Title", type:"keyword", param:"title", operator: "tt", equalityOperator: "="},
55
       ["projectkeywords"]:{name:"Keywords", type:"keyword", param:"keywords", operator: "ky", equalityOperator: "="},
57 56

  
58
       ["funder"]:{name:"Funder", type:"refine", param:"funder", equalityOperator: " exact "},
59
       ["fundinglevel0_id"]:{name:"Funding Stream", type:"refine", param:"funderlv0", equalityOperator: " exact "},
60
       ["fundinglevel1_id"]:{name:"Funding Substream level 1", type:"refine", param:"funderlv1", equalityOperator: " exact "},
61
       ["fundinglevel2_id"]:{name:"Funding Substream level 2", type:"refine", param:"funderlv2", equalityOperator: " exact "},
62
       ["projectstartyear"]:{name:"Start Year", type:"year", param:"startyear", equalityOperator: " exact "},
63
       ["projectendyear"]:{name:"End Year", type:"year", param:"endyear", equalityOperator: " exact "},
64
       ["projectstartdate"]:{name:"Start Date", type:"date", param:"startdate", equalityOperator: " within "},
65
       ["projectenddate"]:{name:"End Date", type:"date", param:"enddate", equalityOperator: " within "},
66
       ["projectecsc39"]:{name:"Special Clause 39", type:"boolean", param:"sc39", equalityOperator: " exact "},
67
       ["projectcode_nt"]:{name:"Project Code", type:"keyword", param:"code", equalityOperator: " exact "},
68
       ["relorganizationid"]:{name:"Organization", type:"entity", param:"organization", equalityOperator: " exact "},
69
       ["collectedfromdatasourceid"]:{name:"Collected from Content Provider", type:"entity", param:"collectedFrom", equalityOperator: " exact "}
57
       ["funder"]:{name:"Funder", type:"refine", param:"funder", operator: "fn", equalityOperator: " exact "},
58
       ["fundinglevel0_id"]:{name:"Funding Stream", type:"refine", param:"funderlv0", operator: "fn0", equalityOperator: " exact "},
59
       ["fundinglevel1_id"]:{name:"Funding Substream level 1", type:"refine", param:"funderlv1", operator: "fn1", equalityOperator: " exact "},
60
       ["fundinglevel2_id"]:{name:"Funding Substream level 2", type:"refine", param:"funderlv2", operator: "fn2", equalityOperator: " exact "},
61
       ["projectstartyear"]:{name:"Start Year", type:"year", param:"startyear", operator: "sy", equalityOperator: " exact "},
62
       ["projectendyear"]:{name:"End Year", type:"year", param:"endyear", operator: "ey", equalityOperator: " exact "},
63
       ["projectstartdate"]:{name:"Start Date", type:"date", param:"startdate", operator: "sd", equalityOperator: " within "},
64
       ["projectenddate"]:{name:"End Date", type:"date", param:"enddate", operator: "ed", equalityOperator: " within "},
65
       ["projectecsc39"]:{name:"Special Clause 39", type:"boolean", param:"sc39", operator: "sc", equalityOperator: " exact "},
66
       ["projectcode_nt"]:{name:"Project Code", type:"keyword", param:"code", operator: "cd", equalityOperator: " exact "},
67
       ["relorganizationid"]:{name:"Organization", type:"entity", param:"organization", operator: "og", equalityOperator: " exact "},
68
       ["collectedfromdatasourceid"]:{name:"Collected from Content Provider", type:"entity", param:"collectedFrom", operator: "cl", equalityOperator: " exact "}
70 69

  
71 70
     };
72 71

  
......
79 78
         "datasourceodcontenttypes", "datasourcecompatibilityname","relorganizationid", "collectedfromdatasourceid"];
80 79

  
81 80
         public DATASOURCE_FIELDS: { [key:string]:FieldDetails}={
82
              ["q"]:{name:"All fields", type:"keyword", param:"q", equalityOperator: "="},
83
              ["datasourceofficialname"]:{name:"English name", type:"keyword", param:"officialname", equalityOperator: "="},
84
              ["datasourceenglishname"]:{name:"Title", type:"keyword", param:"engname", equalityOperator: "="},
85
              ["datasourceodsubjects"]:{name:"Subject", type:"keyword", param:"subjects", equalityOperator: "="},
86
              ["datasourcetypeuiid"]:{name:"Type", type:"refine", param:"type", equalityOperator: " exact "},
87
              ["datasourcetypeuiname"]:{name:"Type", type:"refine", param:"type", equalityOperator: " exact "},
88
              ["datasourcetypename"]:{name:"Type", type:"vocabulary", param:"type", equalityOperator: " exact "},
89
              ["datasourceodlanguages"]:{name:"Language", type:"vocabulary", param:"lang", equalityOperator: " exact "},
90
              ["datasourceodcontenttypes"]:{name:"Content", type:"refine", param:"content", equalityOperator: " exact "},
91
              ["datasourcecompatibilityid"]:{name:"Compatibility Level", type:"refine", param:"compatibility", equalityOperator: " exact "},
92
              ["datasourcecompatibilityname"]:{name:"Compatibility Level", type:"vocabulary", param:"compatibility", equalityOperator: " exact "},
93
              ["relorganizationid"]:{name:"Organization", type:"entity", param:"organization", equalityOperator: " exact "},
94
              ["collectedfromdatasourceid"]:{name:"Collected from Content Provider", type:"entity", param:"collectedFrom", equalityOperator: " exact "}
81
              ["q"]:{name:"All fields", type:"keyword", param:"q", operator: "op", equalityOperator: "="},
82
              ["datasourceofficialname"]:{name:"English name", type:"keyword", param:"officialname", operator: "of", equalityOperator: "="},
83
              ["datasourceenglishname"]:{name:"Title", type:"keyword", param:"engname", operator: "eg", equalityOperator: "="},
84
              ["datasourceodsubjects"]:{name:"Subject", type:"keyword", param:"subjects", operator: "sb", equalityOperator: "="},
85
              ["datasourcetypeuiid"]:{name:"Type", type:"refine", param:"type", operator: "tp", equalityOperator: " exact "},
86
              ["datasourcetypeuiname"]:{name:"Type", type:"refine", param:"type", operator: "tp", equalityOperator: " exact "},
87
              ["datasourcetypename"]:{name:"Type", type:"vocabulary", param:"type", operator: "tp", equalityOperator: " exact "},
88
              ["datasourceodlanguages"]:{name:"Language", type:"vocabulary", param:"lang", operator: "ln", equalityOperator: " exact "},
89
              ["datasourceodcontenttypes"]:{name:"Content", type:"refine", param:"content", operator: "cn", equalityOperator: " exact "},
90
              ["datasourcecompatibilityid"]:{name:"Compatibility Level", type:"refine", param:"compatibility", operator: "cm", equalityOperator: " exact "},
91
              ["datasourcecompatibilityname"]:{name:"Compatibility Level", type:"vocabulary", param:"compatibility", operator: "cm", equalityOperator: " exact "},
92
              ["relorganizationid"]:{name:"Organization", type:"entity", param:"organization", operator: "og", equalityOperator: " exact "},
93
              ["collectedfromdatasourceid"]:{name:"Collected from Content Provider", type:"entity", param:"collectedFrom", operator: "cl", equalityOperator: " exact "}
95 94
            };
96 95

  
97 96
          public COMPATIBLE_DATAPROVIDER_FIELDS:string[] = ["datasourcetypeuiid","datasourcecompatibilityname"];
......
104 103
     public ORGANIZATION_ADVANCED_FIELDS:string[] = ["q", "organizationlegalname","organizationlegalshortname","organizationcountryname"];
105 104

  
106 105
     public ORGANIZATION_FIELDS: { [key:string]:FieldDetails}={
107
                ["q"]:{name:"All fields", type:"keyword", param:"q", equalityOperator: "="},
108
                ["organizationlegalname"]:{name:"Legal Name", type:"keyword", param:"name", equalityOperator: "="},
109
                ["organizationlegalshortname"]:{name:"Legal Short Name", type:"keyword", param:"shortname", equalityOperator: "="},
110
                ["organizationcountryname"]:{name:"Country", type:"vocabulary", param:"country", equalityOperator: "="},
111
              //  ["organizationcountryname"]:{name:"Country", type:"refine", param:"country", equalityOperator: "="}
106
                ["q"]:{name:"All fields", type:"keyword", param:"q", operator:"op", equalityOperator: "="},
107
                ["organizationlegalname"]:{name:"Legal Name", type:"keyword", param:"name", operator: "nm", equalityOperator: "="},
108
                ["organizationlegalshortname"]:{name:"Legal Short Name", type:"keyword", param:"shortname", operator: "so", equalityOperator: "="},
109
                ["organizationcountryname"]:{name:"Country", type:"vocabulary", param:"country", operator: "cu", equalityOperator: "="},
112 110
              };
113
         public ORGANIZATION_INDEX:string[] = ["organizationcountryname"]//,"organizationeclegalbody"];
114
        public ADVANCED_SEARCH_ORGANIZATION_PARAM:string[] = ["q","contenttype","compatibility","country","type"];
115
           public ORGANIZATION_INDEX_PARAM_MAP:{ [key:string]:string } = {["organizationlegalname"]:"contenttype", ["organizationlegalshortname"]:"type",
116
            ["organizationcountryname"]:"country"};//,["organizationeclegalbody"]:"type"};
117
          public ORGANIZATION_FIELDS_MAP: { [key:string]:{ name:string, operator:string, type:string, indexField:string , equalityOperator:string}} ={
118
          ["q"]:{name:"All fields",operator:"op", type:"keyword", indexField:null, equalityOperator: "="},
119
          ["contenttype"]:{name:"Legal Name",operator:"cn", type:"keyword" , indexField:"organizationlegalname", equalityOperator: "="},
120
          ["compatibility"]:{name:"Legal Short Name",operator:"cm", type:"keyword", indexField:"organizationlegalshortname", equalityOperator: "="},
121
          ["country"]:{name:"Country",operator:"cu", type:"vocabulary", indexField:"organizationcountryname", equalityOperator: " exact "},
122
          ["type"]:{name:"Type",operator:"tp", type:"refine", indexField:"organizationeclegalbody", equalityOperator: " exact "},
111
        //  public ORGANIZATION_INDEX:string[] = ["organizationcountryname"]//,"organizationeclegalbody"];
112
        // public ADVANCED_SEARCH_ORGANIZATION_PARAM:string[] = ["q","contenttype","compatibility","country","type"];
113
          //  public ORGANIZATION_INDEX_PARAM_MAP:{ [key:string]:string } = {["organizationlegalname"]:"contenttype", ["organizationlegalshortname"]:"type",
114
          //   ["organizationcountryname"]:"country"};//,["organizationeclegalbody"]:"type"};
115
          // public ORGANIZATION_FIELDS_MAP: { [key:string]:{ name:string, operator:string, type:string, indexField:string , operator: "op", equalityOperator:string}} ={
116
          // ["q"]:{name:"All fields",operator:"op", type:"keyword", indexField:null, operator: "op", equalityOperator: "="},
117
          // ["contenttype"]:{name:"Legal Name",operator:"cn", type:"keyword" , indexField:"organizationlegalname", operator: "op", equalityOperator: "="},
118
          // ["compatibility"]:{name:"Legal Short Name",operator:"cm", type:"keyword", indexField:"organizationlegalshortname", operator: "op", equalityOperator: "="},
119
          // ["country"]:{name:"Country",operator:"cu", type:"vocabulary", indexField:"organizationcountryname", operator: "op", equalityOperator: " exact "},
120
          // ["type"]:{name:"Type",operator:"tp", type:"refine", indexField:"organizationeclegalbody", operator: "op", equalityOperator: " exact "},
121
          //
122
          // };
123 123

  
124
          };
125 124

  
126 125

  
127

  
128 126
     public HIDDEN_FIELDS:string[] = ["fundinglevel0_id","fundinglevel1_id","fundinglevel2_id",
129 127
     "relfundinglevel0_id","relfundinglevel1_id","relfundinglevel2_id"];
130 128

  
......
156 154
     type:string;
157 155
      param:string;
158 156
       equalityOperator:string;
157
       operator:string;
159 158
 }

Also available in: Unified diff