- Made package multi-archive aware. Numerous changes across most files.
- Fixed bug in inc.class.mysql.es.php that meant that eprint ID 1 could never
  be displayed.
- Fixed bug in inc.fns.merge.es.php that caused fractional years to be
  generated.
1 parent b094245 commit e4a2b5486b0d907a58975fc5a0dcc6b91f5e0ee6
nstanger authored on 14 Jun 2006
Showing 21 changed files
View
2
■■■
Repositories/statistics/Makefile
GENERATED_FILES:=config/inc.vars.es.php scripts/eprints-usage.php \
scripts/fix-countries.php vhost/apache.conf
 
CONFIG_SUBS:=EPRINTSSTATS EPRINTS_HOST EPRINTS_PORT EPRINTS_ADMIN_EMAIL
USAGE_SUBS:=GEOIP_DATABASE APACHE_LOG_LOCATION APACHE_LOG_NAME
USAGE_SUBS:=GEOIP_DATABASE APACHE_LOG_LOCATION APACHE_LOG_NAME_1 APACHE_LOG_NAME_2
FIX_SUBS:=GEOIP_DATABASE
VHOST_SUBS:=EPRINTSSTATS PHP_LIB
 
 
View
96
Repositories/statistics/config/inc.vars.es_src.php
"sqlserver" => "localhost",
"sqldatabase" => "eprintstats",
"sqluser_public" => "eprintstatspub",
"sqlpass_public" => "AuldGrizzel",
//
"sqlserver_eprints" => "localhost",
"sqldatabase_eprints" => "otago_eprints",
"sqluser_eprints" => "otago_eprints",
"sqlpass_eprints" => "DrSyntaxRidesAgain",
// NJS 2006-06-14: Generalised the connection list to support
// multiple EPrints archives. Also added the natural-language
// archive name for easy reference.
"eprints_archives" => array(
"default" => array(
"archive_name" => "EPrints Repositories @ Otago",
),
"otago_eprints" => array(
"archive_name" => "Otago EPrints Repository",
"sqlserver_eprints" => "localhost",
"sqluser_eprints" => "otago_eprints",
"sqlpass_eprints" => "DrSyntaxRidesAgain",
),
"cardrona" => array(
"archive_name" => "Cardrona Community Repository",
"sqlserver_eprints" => "localhost",
"sqluser_eprints" => "cardrona",
"sqlpass_eprints" => "chautquau",
),
),
),
"filelocation" => array(
"vTITLE" => "File locations",
"vDESCRIPTION" => "Install directory and location of required files.",
"vTITLE" => "Form actions",
"vDESCRIPTION" => "Which files are included for get/post actions. i.e the pub_default action will include the files listed in the array",
"includes" => array(
'public' => array(
'pub_default' => array ('inc.html.header.es.php','inc.fns.navbar.es.php','inc.html.navbar_global.es.php','inc.html.pub_default.es.php','inc.html.footer.es.php'),
'no_service_public' => array ('inc.html.header.es.php','inc.html.no_service_public.es.php','inc.html.footer.es.php'),
'cumulative_usage' => array ('inc.fns.cumulative_usage.es.php','inc.html.header.es.php','inc.fns.navbar.es.php','inc.html.navbar_global.es.php','inc.html.cumulative_usage.es.php','inc.html.footer.es.php'),
'cumulative_usage_country' => array ('inc.fns.cumulative_usage_country.es.php','inc.html.header.es.php','inc.fns.navbar.es.php','inc.html.navbar_global.es.php','inc.html.cumulative_usage_country.es.php','inc.html.footer.es.php'),
'show_detail_date' => array ('inc.fns.show_detail_date.es.php','inc.html.header.es.php','inc.fns.navbar.es.php','inc.html.navbar_global.es.php','inc.html.show_detail_date.es.php','inc.html.footer.es.php'),
'show_detail_country' => array ('inc.fns.show_detail_country.es.php','inc.html.header.es.php','inc.fns.navbar.es.php','inc.html.navbar_global.es.php','inc.html.show_detail_country.es.php','inc.html.footer.es.php'),
'show_detail_eprint' => array ('inc.fns.show_detail_eprint.es.php','inc.html.header.es.php','inc.fns.navbar.es.php','inc.html.navbar_global.es.php','inc.html.show_detail_eprint.es.php','inc.html.footer.es.php'),
// NJS 2006-06-14
'default' => array(
'pub_default' => array ('inc.html.header.es.php','inc.fns.navbar.es.php','inc.html.navbar_global.es.php','inc.html.pub_default.es.php','inc.html.footer.es.php'),
'no_service_public' => array ('inc.html.header.es.php','inc.html.no_service_public.es.php','inc.html.footer.es.php'),
'cumulative_usage' => array ('inc.fns.cumulative_usage.es.php','inc.html.header.es.php','inc.fns.navbar.es.php','inc.html.navbar_global.es.php','inc.html.cumulative_usage.es.php','inc.html.footer.es.php'),
'cumulative_usage_country' => array ('inc.fns.cumulative_usage_country.es.php','inc.html.header.es.php','inc.fns.navbar.es.php','inc.html.navbar_global.es.php','inc.html.cumulative_usage_country.es.php','inc.html.footer.es.php'),
'show_detail_date' => array ('inc.fns.show_detail_date.es.php','inc.html.header.es.php','inc.fns.navbar.es.php','inc.html.navbar_global.es.php','inc.html.show_detail_date.es.php','inc.html.footer.es.php'),
'show_detail_country' => array ('inc.fns.show_detail_country.es.php','inc.html.header.es.php','inc.fns.navbar.es.php','inc.html.navbar_global.es.php','inc.html.show_detail_country.es.php','inc.html.footer.es.php'),
'show_detail_eprint' => array ('inc.fns.show_detail_eprint.es.php','inc.html.header.es.php','inc.fns.navbar.es.php','inc.html.navbar_global.es.php','inc.html.show_detail_eprint.es.php','inc.html.footer.es.php'),
),
'otago_eprints' => array(
'pub_default' => array ('inc.html.header.es.php','inc.fns.navbar.es.php','inc.html.navbar_global.es.php','inc.html.pub_default.es.php','inc.html.footer.es.php'),
'no_service_public' => array ('inc.html.header.es.php','inc.html.no_service_public.es.php','inc.html.footer.es.php'),
'cumulative_usage' => array ('inc.fns.cumulative_usage.es.php','inc.html.header.es.php','inc.fns.navbar.es.php','inc.html.navbar_global.es.php','inc.html.cumulative_usage.es.php','inc.html.footer.es.php'),
'cumulative_usage_country' => array ('inc.fns.cumulative_usage_country.es.php','inc.html.header.es.php','inc.fns.navbar.es.php','inc.html.navbar_global.es.php','inc.html.cumulative_usage_country.es.php','inc.html.footer.es.php'),
'show_detail_date' => array ('inc.fns.show_detail_date.es.php','inc.html.header.es.php','inc.fns.navbar.es.php','inc.html.navbar_global.es.php','inc.html.show_detail_date.es.php','inc.html.footer.es.php'),
'show_detail_country' => array ('inc.fns.show_detail_country.es.php','inc.html.header.es.php','inc.fns.navbar.es.php','inc.html.navbar_global.es.php','inc.html.show_detail_country.es.php','inc.html.footer.es.php'),
'show_detail_eprint' => array ('inc.fns.show_detail_eprint.es.php','inc.html.header.es.php','inc.fns.navbar.es.php','inc.html.navbar_global.es.php','inc.html.show_detail_eprint.es.php','inc.html.footer.es.php'),
),
'cardrona' => array(
'pub_default' => array ('inc.html.header.es.php','inc.fns.navbar.es.php','inc.html.navbar_global.es.php','inc.html.pub_default.es.php','inc.html.footer.es.php'),
'no_service_public' => array ('inc.html.header.es.php','inc.html.no_service_public.es.php','inc.html.footer.es.php'),
'cumulative_usage' => array ('inc.fns.cumulative_usage.es.php','inc.html.header.es.php','inc.fns.navbar.es.php','inc.html.navbar_global.es.php','inc.html.cumulative_usage.es.php','inc.html.footer.es.php'),
'cumulative_usage_country' => array ('inc.fns.cumulative_usage_country.es.php','inc.html.header.es.php','inc.fns.navbar.es.php','inc.html.navbar_global.es.php','inc.html.cumulative_usage_country.es.php','inc.html.footer.es.php'),
'show_detail_date' => array ('inc.fns.show_detail_date.es.php','inc.html.header.es.php','inc.fns.navbar.es.php','inc.html.navbar_global.es.php','inc.html.show_detail_date.es.php','inc.html.footer.es.php'),
'show_detail_country' => array ('inc.fns.show_detail_country.es.php','inc.html.header.es.php','inc.fns.navbar.es.php','inc.html.navbar_global.es.php','inc.html.show_detail_country.es.php','inc.html.footer.es.php'),
'show_detail_eprint' => array ('inc.fns.show_detail_eprint.es.php','inc.html.header.es.php','inc.fns.navbar.es.php','inc.html.navbar_global.es.php','inc.html.show_detail_eprint.es.php','inc.html.footer.es.php'),
),
),
),
),
);
View
11
Repositories/statistics/htdocs/index.php
Are we public or private. This alters which files get included.
We try to keep the public included files separate.
*/
$GLOBALS["config_vars"]["thisrequest"] = 'public';
// NJS 2006-06-14
if ( isset( $_REQUEST["archive"] ) )
{
$GLOBALS["config_vars"]["archivename"] = $_REQUEST["archive"];
}
else
{
$GLOBALS["config_vars"]["archivename"] = 'default';
}
 
/*
Check the input GET/POST according to the input_filter vars in inc.vars file.
*/
loadPages("no_service_public");
exitScript();
}
if (isset($_REQUEST["action"]) and isset($GLOBALS["config_vars"]["actions"]["includes"][$GLOBALS["config_vars"]["thisrequest"]][$_REQUEST["action"]])){
if (isset($_REQUEST["action"]) and isset($GLOBALS["config_vars"]["actions"]["includes"][$GLOBALS["config_vars"]["thisrequest"]][$GLOBALS["config_vars"]["archivename"]][$_REQUEST["action"]])){
$switchpages = loadPages($_REQUEST["action"]);
if ($switchpages)
loadPages($switchpages);
} else {
View
Repositories/statistics/includes/inc.class.mysql.es.php
View
Repositories/statistics/includes/inc.fns.cumulative_usage.es.php
View
Repositories/statistics/includes/inc.fns.cumulative_usage_country.es.php
View
Repositories/statistics/includes/inc.fns.es.php
View
Repositories/statistics/includes/inc.fns.merge.es.php
View
Repositories/statistics/includes/inc.fns.show_detail_country.es.php
View
Repositories/statistics/includes/inc.fns.show_detail_date.es.php
View
Repositories/statistics/includes/inc.fns.show_detail_eprint.es.php
View
Repositories/statistics/includes/inc.html.cumulative_usage.es.php
View
Repositories/statistics/includes/inc.html.cumulative_usage_country.es.php
View
Repositories/statistics/includes/inc.html.footer.es.php
View
Repositories/statistics/includes/inc.html.header.es.php
View
Repositories/statistics/includes/inc.html.navbar_eprint.es.php
View
Repositories/statistics/includes/inc.html.navbar_global.es.php
View
Repositories/statistics/includes/inc.html.show_detail_country.es.php
View
Repositories/statistics/includes/inc.html.show_detail_date.es.php
View
Repositories/statistics/includes/inc.html.show_detail_eprint.es.php
View
Repositories/statistics/scripts/eprints-usage_src.php