Project

General

Profile

« Previous | Next » 

Revision 2258

Added by Matt Jones over 19 years ago

Modifications to the registry to support the new ESA skin. Factored out some of
the configuration-specific code into properties that are set in the various
cfg files in the skins. New properties in the cfg files are lsite, usite,
showSiteList, showWgList, showOrganization. These now need to be set in every skin
configuration file, in addition to the previous settings. These changes need to be
tested for every skin before being deployed.

View differences:

register-dataset.cgi
72 72
$config->define("accesssysid");
73 73
$config->define("datasetpubid");
74 74
$config->define("datasetsysid");
75
$config->define("showSiteList", { DEFAULT => 'true'} );
76
$config->define("lsite", { DEFAULT => 'station'} );
77
$config->define("usite", { DEFAULT => 'Station'} );
78
$config->define("showWgList", { DEFAULT => 'true'} );
79
$config->define("showOrganization", { DEFAULT => 'true'} );
75 80
$config->define("hasKeyword", { DEFAULT => 'true'} );
76 81
$config->define("hasTemporal", { DEFAULT => 'true'} );
77 82
$config->define("hasSpatial", { DEFAULT => 'true'} );
......
124 129
my $accesssysid = $config->accesssysid();
125 130
my $datasetpubid = $config->datasetpubid();
126 131
my $datasetsysid = $config->datasetsysid();
132
my $showSiteList = $config->showSiteList();
133
my $lsite = $config->lsite();
134
my $usite = $config->usite();
135
my $showWgList = $config->showWgList();
136
my $showOrganization = $config->showOrganization();
127 137
my $hasKeyword = $config->hasKeyword();
128 138
my $hasTemporal = $config->hasTemporal();
129 139
my $hasSpatial = $config->hasSpatial();
......
247 257
        $$templateVars{'wg'} = \@FORM::wg;
248 258
    }
249 259

  
260
    $$templateVars{'showSiteList'} = $showSiteList;
261
    $$templateVars{'lsite'} = $lsite;
262
    $$templateVars{'usite'} = $usite;
263
    $$templateVars{'showWgList'} = $showWgList;
264
    $$templateVars{'showOrganization'} = $showOrganization;
250 265
    $$templateVars{'hasKeyword'} = $hasKeyword;
251 266
    $$templateVars{'hasTemporal'} = $hasTemporal;
252 267
    $$templateVars{'hasSpatial'} = $hasSpatial;
......
1512 1527
    my $foundDSO;
1513 1528

  
1514 1529
    # set variable values
1530
    $$templateVars{'showSiteList'} = $showSiteList;
1531
    $$templateVars{'lsite'} = $lsite;
1532
    $$templateVars{'usite'} = $usite;
1533
    $$templateVars{'showWgList'} = $showWgList;
1534
    $$templateVars{'showOrganization'} = $showOrganization;
1515 1535
    $$templateVars{'hasKeyword'} = $hasKeyword;
1516 1536
    $$templateVars{'hasTemporal'} = $hasTemporal;
1517 1537
    $$templateVars{'hasSpatial'} = $hasSpatial;
......
1930 1950
                    eval($coord = ($coord - int($coord))*60);
1931 1951
                    eval($$templateVars{'longSec2'} = int($coord));
1932 1952

  
1933
		    $$templateVars{'hasSpatial'} = "true";
1953
		            $$templateVars{'hasSpatial'} = "true";
1934 1954
                }
1935 1955
            }
1936 1956

  
......
2399 2419
    $$templateVars{'samplingDescription'} = normalizeCD($FORM::samplingDescription);
2400 2420
    $$templateVars{'origStateContact'} = $FORM::origState;
2401 2421

  
2422
    $$templateVars{'showSiteList'} = $FORM::showSiteList;
2423
    $$templateVars{'lsite'} = $FORM::lsite;
2424
    $$templateVars{'usite'} = $FORM::usite;
2425
    $$templateVars{'showWgList'} = $FORM::showWgList;
2426
    $$templateVars{'showOrganization'} = $FORM::showOrganization;
2402 2427
    $$templateVars{'hasKeyword'} = $FORM::hasKeyword;
2403 2428
    $$templateVars{'hasTemporal'} = $FORM::hasTemporal;
2404 2429
    $$templateVars{'hasSpatial'} = $FORM::hasSpatial;
......
2589 2614
    $$templateVars{'studyExtentDescription'} = $FORM::studyExtentDescription;
2590 2615
    $$templateVars{'samplingDescription'} = $FORM::samplingDescription;
2591 2616
    
2617
    $$templateVars{'showSiteList'} = $FORM::showSiteList;
2618
    $$templateVars{'lsite'} = $FORM::lsite;
2619
    $$templateVars{'usite'} = $FORM::usite;
2620
    $$templateVars{'showWgList'} = $FORM::showWgList;
2621
    $$templateVars{'showOrganization'} = $FORM::showOrganization;
2592 2622
    $$templateVars{'hasKeyword'} = $FORM::hasKeyword;
2593 2623
    $$templateVars{'hasTemporal'} = $FORM::hasTemporal;
2594 2624
    $$templateVars{'hasSpatial'} = $FORM::hasSpatial;

Also available in: Unified diff