- Switched to different country codes for different classes of local traffic, and to fix the problem of download numbers being assigned to the wrong class.

nigel.stanger / Digital_Repository

Browse code - Switched to different country codes for different classes of local traffic, and to fix the problem of download numbers being assigned to the wrong class. master
1 parent ca58802 commit e06de169a463a6a51ee450cd7c8116fed63fea91 nstanger authored on 16 Dec 2005

Patch

Showing 5 changed files

Ignore Space Show notes View Repositories/statistics/config/inc.vars.es_src.php
<?php /* Configuration for ePrintstats project. The serialized vars in user.serialized.es.cfg are read after this so may override any values. This is done to allow settings to be changed via the web admin interface. Note that many of the variables are actually not used as eprintstats uses code from another project. / // These are available globally by default. // Not all are relevant as code was copied from another project. define("ERROR_EXIT", 1); define("ERROR_CONTINUE", 0); define("GET_POST_PROCESS_INVALID", TRUE); define("UNSET_REQUEST", 1); define("UNSET_KEY", 2); define("UNSET_CONTINUE", 3); define("UNSET_ACTION", 4); define("UNSET_REPLACE", 5); define("NOT_EMPTY", 1); // These are loaded to $GLOBALS and are available throughout the program without using "global" $GLOBALS["config_vars"] = array( "debug" => array( "vTITLE" => "Debug output", "vDESCRIPTION" => "TRUE or FALSE selected for public or private", / the initial page needs to be able to identify if public (no auth) or private (auth) / "public" => 1 ), "connections" => array( "vTITLE" => "SQL server settings", "vDESCRIPTION" => "Specify the server name, database name, and user accounts to use.", "sqlserver" => "localhost", "sqldatabase" => "eprintstats", "sqluser_public" => "eprintstatspub", "sqlpass_public" => "AuldGrizzel", // "sqlserver_eprints" => "localhost", "sqldatabase_eprints" => "otago_eprints", "sqluser_eprints" => "otago_eprints", "sqlpass_eprints" => "DrSyntaxRidesAgain", ), "filelocation" => array( "vTITLE" => "File locations", "vDESCRIPTION" => "Install directory and location of required files.", "base_install_dir" => array( "unix" => "##EPRINTSSTATS##", "windows" => "C:/ePrintsStats", ), "base_log_dir" => "logs", "base_includes_dir" => "includes", "base_session_dir" => "session", "base_config_dir" => "config", ), "input_filter" => array( "vTITLE" => "Input filtering.", "vDESCRIPTION" => "Input checking for GET POST", / List of allowed key/value pairs and COOKIES Values either explicit or a function / / Escaping of strings destined for sql are dealt with by the sql object. / / Excludes the action array which is explicitly named below. / / How to deal with sets of parameters. Define arrays of them? / "keys" => array( "public" => array( "action" => array( "maxlength" => "20", "type" => "string", "action" => UNSET_REQUEST, "pattern" => "/[^\w]/i", "values" => array('one','two'), ), "year" => array( "maxlength" => "50", "type" => "freetext", "action" => UNSET_REPLACE, "pattern" => "/[%;#--<>\(\)]/i", "replacement" => "", "content" => NOT_EMPTY, ), "month" => array( "maxlength" => "50", "type" => "freetext", "action" => UNSET_REPLACE, "pattern" => "/[%;#--<>\(\)]/i", "replacement" => "", "content" => NOT_EMPTY, ), "range" => array( "maxlength" => "20", "type" => "string", "action" => UNSET_REQUEST, "pattern" => "/[^\w]/i", "values" => array('one','two'), ), "code" => array( "maxlength" => "3", "type" => "string", "action" => UNSET_REQUEST, "pattern" => "/[^\w]/i", "values" => array('one','two'), ), / maxlength here refers to largest integer / "id" => array( "maxlength" => "1005", "type" => "integer", "action" => UNSET_REQUEST, ), ), ), ), "general" => array( "vTITLE" => "General progam details", "vDESCRIPTION" => "Admin name and contact, prog title", "admin_name" => "ePrints Administrator", "admin_email" => "##EPRINTS_ADMIN_EMAIL##", "support_name" => "ePrints Administrator", "support_email" => "##EPRINTS_ADMIN_EMAIL##", "prog_title" => "ePrints Statistics", "prog_title_public" => "ePrints Statistics", "short_prog_title" => "es", "public_prog" => "index.php", "public_prog_request_uri" => "/index.php", "eprints_location" => "http://##EPRINTS_HOST##:##EPRINTS_PORT##", / replaced admin_prog / "prog_address" => array( "public" => "index.php", ), ), / NJS 2005-12-16 Local network setup. Must correspond to the $local_IPs variable in eprints-usage.php. / "local_networks" => array( "XA" => "Repository Admin", "XI" => "Otago Intranet", ), "messages" => array( "vTITLE" => "Messages", "vDESCRIPTION" => "Error messages.", "message_noservice" => "This service is currently unavailable.", "message_missing_include" => "Missing include file.", ), "actions" => array( "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.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.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.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.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.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.html.show_detail_eprint.es.php','inc.html.footer.es.php'), ), ), ), ); <?php / Configuration for ePrintstats project. The serialized vars in user.serialized.es.cfg are read after this so may override any values. This is done to allow settings to be changed via the web admin interface. Note that many of the variables are actually not used as eprintstats uses code from another project. / // These are available globally by default. // Not all are relevant as code was copied from another project. define("ERROR_EXIT", 1); define("ERROR_CONTINUE", 0); define("GET_POST_PROCESS_INVALID", TRUE); define("UNSET_REQUEST", 1); define("UNSET_KEY", 2); define("UNSET_CONTINUE", 3); define("UNSET_ACTION", 4); define("UNSET_REPLACE", 5); define("NOT_EMPTY", 1); // These are loaded to $GLOBALS and are available throughout the program without using "global" $GLOBALS["config_vars"] = array( "debug" => array( "vTITLE" => "Debug output", "vDESCRIPTION" => "TRUE or FALSE selected for public or private", / the initial page needs to be able to identify if public (no auth) or private (auth) / "public" => 1 ), "connections" => array( "vTITLE" => "SQL server settings", "vDESCRIPTION" => "Specify the server name, database name, and user accounts to use.", "sqlserver" => "localhost", "sqldatabase" => "eprintstats", "sqluser_public" => "eprintstatspub", "sqlpass_public" => "AuldGrizzel", // "sqlserver_eprints" => "localhost", "sqldatabase_eprints" => "otago_eprints", "sqluser_eprints" => "otago_eprints", "sqlpass_eprints" => "DrSyntaxRidesAgain", ), "filelocation" => array( "vTITLE" => "File locations", "vDESCRIPTION" => "Install directory and location of required files.", "base_install_dir" => array( "unix" => "##EPRINTSSTATS##", "windows" => "C:/ePrintsStats", ), "base_log_dir" => "logs", "base_includes_dir" => "includes", "base_session_dir" => "session", "base_config_dir" => "config", ), "input_filter" => array( "vTITLE" => "Input filtering.", "vDESCRIPTION" => "Input checking for GET POST", / List of allowed key/value pairs and COOKIES Values either explicit or a function / / Escaping of strings destined for sql are dealt with by the sql object. / / Excludes the action array which is explicitly named below. / / How to deal with sets of parameters. Define arrays of them? / "keys" => array( "public" => array( "action" => array( "maxlength" => "20", "type" => "string", "action" => UNSET_REQUEST, "pattern" => "/[^\w]/i", "values" => array('one','two'), ), "year" => array( "maxlength" => "50", "type" => "freetext", "action" => UNSET_REPLACE, "pattern" => "/[%;#--<>\(\)]/i", "replacement" => "", "content" => NOT_EMPTY, ), "month" => array( "maxlength" => "50", "type" => "freetext", "action" => UNSET_REPLACE, "pattern" => "/[%;#--<>\(\)]/i", "replacement" => "", "content" => NOT_EMPTY, ), "range" => array( "maxlength" => "20", "type" => "string", "action" => UNSET_REQUEST, "pattern" => "/[^\w]/i", "values" => array('one','two'), ), "code" => array( "maxlength" => "3", "type" => "string", "action" => UNSET_REQUEST, "pattern" => "/[^\w]/i", "values" => array('one','two'), ), / maxlength here refers to largest integer / "id" => array( "maxlength" => "1005", "type" => "integer", "action" => UNSET_REQUEST, ), ), ), ), "general" => array( "vTITLE" => "General progam details", "vDESCRIPTION" => "Admin name and contact, prog title", "admin_name" => "ePrints Administrator", "admin_email" => "##EPRINTS_ADMIN_EMAIL##", "support_name" => "ePrints Administrator", "support_email" => "##EPRINTS_ADMIN_EMAIL##", "prog_title" => "ePrints Statistics", "prog_title_public" => "ePrints Statistics", "short_prog_title" => "es", "public_prog" => "index.php", "public_prog_request_uri" => "/index.php", "eprints_location" => "http://##EPRINTS_HOST##:##EPRINTS_PORT##", / replaced admin_prog */ "prog_address" => array( "public" => "index.php", ), "local_intranet_name" => "Otago Intranet", ), "messages" => array( "vTITLE" => "Messages", "vDESCRIPTION" => "Error messages.", "message_noservice" => "This service is currently unavailable.", "message_missing_include" => "Missing include file.", ), "actions" => array( "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.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.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.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.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.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.html.show_detail_eprint.es.php','inc.html.footer.es.php'), ), ), ), );

Ignore Space Show notes View

Repositories/statistics/config/inc.vars.es_src.php

<?php

/*
		Configuration for ePrintstats project.
		The serialized vars in user.serialized.es.cfg are read after this
		so may override any values. This is done to allow settings to be 
		changed via the web admin interface.

Note that many of the variables are actually not used as eprintstats uses
		code from another project.
	*/

// These are available globally by default.
	// Not all are relevant as code was copied from another project.
	define("ERROR_EXIT", 1); 
	define("ERROR_CONTINUE", 0); 
	define("GET_POST_PROCESS_INVALID", TRUE);
	define("UNSET_REQUEST", 1);
	define("UNSET_KEY", 2);
	define("UNSET_CONTINUE", 3);
	define("UNSET_ACTION", 4);
	define("UNSET_REPLACE", 5);
	define("NOT_EMPTY", 1);
	
	// These are loaded to $GLOBALS and are available throughout the program without using "global"
	$GLOBALS["config_vars"] = array(
		"debug" => array(
			"vTITLE" => "Debug output",
			"vDESCRIPTION" => "TRUE or FALSE selected for public or private",
			/* the initial page needs to be able to identify if public (no auth) or private (auth) */
			"public" => 1
		),
		"connections" => array(
			"vTITLE" => "SQL server settings",
			"vDESCRIPTION" => "Specify the server name, database name, and user accounts to use.",
			"sqlserver" => "localhost",
			"sqldatabase" => "eprintstats",
			"sqluser_public" => "eprintstatspub",
			"sqlpass_public" => "AuldGrizzel",
			//
			"sqlserver_eprints" => "localhost",
			"sqldatabase_eprints" => "otago_eprints",
			"sqluser_eprints" => "otago_eprints",
			"sqlpass_eprints" => "DrSyntaxRidesAgain",
		),
		"filelocation" => array(
			"vTITLE" => "File locations",
			"vDESCRIPTION" => "Install directory and location of required files.",
			"base_install_dir" => array(
				"unix" => "##EPRINTSSTATS##",
				"windows" => "C:/ePrintsStats",
			),
			"base_log_dir" => "logs",
			"base_includes_dir" => "includes",
			"base_session_dir" => "session",
			"base_config_dir" => "config",
		),
		"input_filter" => array(
			"vTITLE" => "Input filtering.",
			"vDESCRIPTION" => "Input checking for GET POST",
			/* List of allowed key/value pairs and COOKIES Values either explicit or a function */
			/* Escaping of strings destined for sql are dealt with by the sql object. */
			/* Excludes the action array which is explicitly named below. */
			/* How to deal with sets of parameters. Define arrays of them? */
			"keys" => array(
				"public" => array(
					"action" => array(
						"maxlength" => "20",
						"type" => "string",
						"action" => UNSET_REQUEST,
						"pattern" => "/[^\w]/i",
						"values" => array('one','two'),
					),
					"year" => array(
						"maxlength" => "50",
						"type" => "freetext",
						"action" => UNSET_REPLACE,
						"pattern" => "/[%;#--<>]/i",
						"replacement" => "",
						"content" => NOT_EMPTY,
					),
					"month" => array(
						"maxlength" => "50",
						"type" => "freetext",
						"action" => UNSET_REPLACE,
						"pattern" => "/[%;#--<>]/i",
						"replacement" => "",
						"content" => NOT_EMPTY,
					),
					"range" => array(
						"maxlength" => "20",
						"type" => "string",
						"action" => UNSET_REQUEST,
						"pattern" => "/[^\w]/i",
						"values" => array('one','two'),
					),
					"code" => array(
						"maxlength" => "3",
						"type" => "string",
						"action" => UNSET_REQUEST,
						"pattern" => "/[^\w]/i",
						"values" => array('one','two'),
					),
					/* maxlength here refers to largest integer */
					"id" => array(
						"maxlength" => "1005",
						"type" => "integer",
						"action" => UNSET_REQUEST,
					),
				),
			),
		),
		"general" => array(
			"vTITLE" => "General progam details",
			"vDESCRIPTION" => "Admin name and contact, prog title",
			"admin_name" => "ePrints Administrator",
			"admin_email" => "##EPRINTS_ADMIN_EMAIL##",
			"support_name" => "ePrints Administrator",
			"support_email" => "##EPRINTS_ADMIN_EMAIL##",
			"prog_title" => "ePrints Statistics",
			"prog_title_public" => "ePrints Statistics",
			"short_prog_title" => "es",
			"public_prog" => "index.php",
			"public_prog_request_uri" => "/index.php",
			"eprints_location" => "http://##EPRINTS_HOST##:##EPRINTS_PORT##",
			/* replaced admin_prog */
			"prog_address" => array(
				"public" => "index.php",
			),
		),
		/* NJS 2005-12-16
			Local network setup. Must correspond to the $local_IPs
			variable in eprints-usage.php.
		*/
		"local_networks" => array(
			"XA" => "Repository Admin",
			"XI" => "Otago Intranet",
		),
		"messages" => array(
			"vTITLE" => "Messages",
			"vDESCRIPTION" => "Error messages.",
			"message_noservice" => "This service is currently unavailable.",
			"message_missing_include" => "Missing include file.",
		),
		"actions" => array(
			"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.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.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.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.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.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.html.show_detail_eprint.es.php','inc.html.footer.es.php'),
				),
			),
		),
	);

<?php

Note that many of the variables are actually not used as eprintstats uses
		code from another project.
	*/

// These are available globally by default.
	// Not all are relevant as code was copied from another project.
	define("ERROR_EXIT", 1); 
	define("ERROR_CONTINUE", 0); 
	define("GET_POST_PROCESS_INVALID", TRUE);
	define("UNSET_REQUEST", 1);
	define("UNSET_KEY", 2);
	define("UNSET_CONTINUE", 3);
	define("UNSET_ACTION", 4);
	define("UNSET_REPLACE", 5);
	define("NOT_EMPTY", 1);
	
	// These are loaded to $GLOBALS and are available throughout the program without using "global"
	$GLOBALS["config_vars"] = array(
		"debug" => array(
			"vTITLE" => "Debug output",
			"vDESCRIPTION" => "TRUE or FALSE selected for public or private",
			/* the initial page needs to be able to identify if public (no auth) or private (auth) */
			"public" => 1
		),
		"connections" => array(
			"vTITLE" => "SQL server settings",
			"vDESCRIPTION" => "Specify the server name, database name, and user accounts to use.",
			"sqlserver" => "localhost",
			"sqldatabase" => "eprintstats",
			"sqluser_public" => "eprintstatspub",
			"sqlpass_public" => "AuldGrizzel",
			//
			"sqlserver_eprints" => "localhost",
			"sqldatabase_eprints" => "otago_eprints",
			"sqluser_eprints" => "otago_eprints",
			"sqlpass_eprints" => "DrSyntaxRidesAgain",
		),
		"filelocation" => array(
			"vTITLE" => "File locations",
			"vDESCRIPTION" => "Install directory and location of required files.",
			"base_install_dir" => array(
				"unix" => "##EPRINTSSTATS##",
				"windows" => "C:/ePrintsStats",
			),
			"base_log_dir" => "logs",
			"base_includes_dir" => "includes",
			"base_session_dir" => "session",
			"base_config_dir" => "config",
		),
		"input_filter" => array(
			"vTITLE" => "Input filtering.",
			"vDESCRIPTION" => "Input checking for GET POST",
			/* List of allowed key/value pairs and COOKIES Values either explicit or a function */
			/* Escaping of strings destined for sql are dealt with by the sql object. */
			/* Excludes the action array which is explicitly named below. */
			/* How to deal with sets of parameters. Define arrays of them? */
			"keys" => array(
				"public" => array(
					"action" => array(
						"maxlength" => "20",
						"type" => "string",
						"action" => UNSET_REQUEST,
						"pattern" => "/[^\w]/i",
						"values" => array('one','two'),
					),
					"year" => array(
						"maxlength" => "50",
						"type" => "freetext",
						"action" => UNSET_REPLACE,
						"pattern" => "/[%;#--<>]/i",
						"replacement" => "",
						"content" => NOT_EMPTY,
					),
					"month" => array(
						"maxlength" => "50",
						"type" => "freetext",
						"action" => UNSET_REPLACE,
						"pattern" => "/[%;#--<>]/i",
						"replacement" => "",
						"content" => NOT_EMPTY,
					),
					"range" => array(
						"maxlength" => "20",
						"type" => "string",
						"action" => UNSET_REQUEST,
						"pattern" => "/[^\w]/i",
						"values" => array('one','two'),
					),
					"code" => array(
						"maxlength" => "3",
						"type" => "string",
						"action" => UNSET_REQUEST,
						"pattern" => "/[^\w]/i",
						"values" => array('one','two'),
					),
					/* maxlength here refers to largest integer */
					"id" => array(
						"maxlength" => "1005",
						"type" => "integer",
						"action" => UNSET_REQUEST,
					),
				),
			),
		),
		"general" => array(
			"vTITLE" => "General progam details",
			"vDESCRIPTION" => "Admin name and contact, prog title",
			"admin_name" => "ePrints Administrator",
			"admin_email" => "##EPRINTS_ADMIN_EMAIL##",
			"support_name" => "ePrints Administrator",
			"support_email" => "##EPRINTS_ADMIN_EMAIL##",
			"prog_title" => "ePrints Statistics",
			"prog_title_public" => "ePrints Statistics",
			"short_prog_title" => "es",
			"public_prog" => "index.php",
			"public_prog_request_uri" => "/index.php",
			"eprints_location" => "http://##EPRINTS_HOST##:##EPRINTS_PORT##",
			/* replaced admin_prog */
			"prog_address" => array(
				"public" => "index.php",
			),
			"local_intranet_name" => "Otago Intranet",
		),
		"messages" => array(
			"vTITLE" => "Messages",
			"vDESCRIPTION" => "Error messages.",
			"message_noservice" => "This service is currently unavailable.",
			"message_missing_include" => "Missing include file.",
		),
		"actions" => array(
			"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.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.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.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.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.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.html.show_detail_eprint.es.php','inc.html.footer.es.php'),
				),
			),
		),
	);

Ignore Space Show notes View Repositories/statistics/htdocs/flags18x14/xa.png 0 → 100755

Ignore Space Show notes View Repositories/statistics/includes/inc.fns.show_detail_country.es.php
<?php /* NJS 2005-12-15 Usage by country, totals. / include("geoip.inc"); $gi = new GeoIP; // Get detail given country $show_country = $_REQUEST["code"]; $show_country_code = strtoupper($show_country); $show_country_name = ''; / Check whether the country code is one of our local network "country codes". / foreach ($GLOBALS["config_vars"]["local_networks"] as $ccode => $cname) { if ($show_country_code == $ccode) $show_country_name = $cname; } if ($show_country_name == '') { if (isset($gi->GEOIP_COUNTRY_CODE_TO_NUMBER[$show_country_code])) { $show_country_num = $gi->GEOIP_COUNTRY_CODE_TO_NUMBER[$show_country_code]; $show_country_name = $gi->GEOIP_COUNTRY_NAMES[$show_country_num]; } else { $show_country_name = 'Unknown'; } } $GLOBALS["db_values"] = $sql->getArchiveCountCountry($_REQUEST["code"]); ?> <?php / Usage by country, totals. */ include("geoip.inc"); $gi = new GeoIP; // Get detail given country $show_country = $_REQUEST["code"]; $show_country_code = strtoupper($show_country); if ($show_country_code == 'T5') { $show_country_name = $GLOBALS["config_vars"]["general"]["local_intranet_name"]; } else if (isset($gi->GEOIP_COUNTRY_CODE_TO_NUMBER[$show_country_code])) { $show_country_num = $gi->GEOIP_COUNTRY_CODE_TO_NUMBER[$show_country_code]; $show_country_name = $gi->GEOIP_COUNTRY_NAMES[$show_country_num]; } else { $show_country_name = 'Unknown'; } $GLOBALS["db_values"] = $sql->getArchiveCountCountry($_REQUEST["code"]); ?>

Ignore Space Show notes View

Repositories/statistics/includes/inc.fns.show_detail_country.es.php

Ignore Space Show notes View Repositories/statistics/includes/inc.html.show_detail_country.es.php
<?php // NJS 2005-12-15 require("inc.html.navbar_global.es.php"); ?> <h3>Document downloads from: <?php print $show_country_name; // select a flag print ' '; $c_flag = 'flags18x14/' . $show_country . '.png'; if (file_exists($c_flag)) { print '<img src="'. $c_flag . '" width="18" height="14" alt="'. $show_country . '">'; } else { print '<img src="flags18x14/unknown.png" width="18" height="14" alt="' . $show_country . '">'; }; ?></h3> <?php if (isset ($GLOBALS["db_values"]["0"]["count"])) { print '<span style="font-size:small;">Click on a document title to see detailed statistics for that document</span>'; print "<table cellspacing='0' cellpadding='4'>\n"; print '<tr><th style="background-color:#cccccc;">Document</th> <th style="background-color:#4477dd;color:#ffffff;">Downloads</th></tr>'; } else { print "<table cellspacing='0' cellpadding='4'>\n"; print '<tr><td><strong style="color:#ff0000;">No downloads for this country.</strong></td></tr>'; } for ($rs=0;$rs<count($GLOBALS["db_values"]);$rs++) { $extra_args = array(); $cur_count = $GLOBALS["db_values"][$rs]["count"]; if(isset($_REQUEST["year"])) { $extra_args[] = "year=".$_REQUEST["year"]; } if(isset($_REQUEST["month"])) { $extra_args[] = "month=".$_REQUEST["month"]; } if(isset($_REQUEST["range"])) { $extra_args[] = "range=".$_REQUEST["range"]; } // NJS 2005-12-15: subtly highlight every alternate row print '<tr'; if ($rs % 2) print ' style="background-color:#EDF3FE;"'; print '><td width="600" align="left" style="font-size:small;"><a href="'. $_SERVER['PHP_SELF']. '?action=show_detail_eprint;id='. $GLOBALS["db_values"][$rs]["archiveid"]. ';'. implode(";",$extra_args). '">'. $GLOBALS["db_values"][$rs]["eprint_name"]. '</a></td><td align="right" style="font-size:small;">'. $GLOBALS["db_values"][$rs]["count"]. '</td></tr>'; } print "</table>\n"; ?> <?php require("inc.html.navbar_global.es.php"); ?> <h3>Document downloads from: <?php print $show_country_name; // select a flag print ' '; $c_flag = 'flags18x14/' . $show_country . '.png'; if (file_exists($c_flag)) { print '<img src="'. $c_flag . '" width="18" height="14" alt="'. $show_country . '">'; } else { print '<img src="flags18x14/unknown.png" width="18" height="14" alt="' . $show_country . '">'; }; ?></h3> <?php if (isset ($GLOBALS["db_values"]["0"]["count"])) { print '<span style="font-size:small;">Click on a document title to see detailed statistics for that document</span>'; print "<table cellspacing='0' cellpadding='4'>\n"; print '<tr><th style="background-color:#cccccc;">Document</th> <th style="background-color:#4477dd;color:#ffffff;">Downloads</th></tr>'; } else { print "<table cellspacing='0' cellpadding='4'>\n"; print '<tr><td><strong style="color:#ff0000;">No downloads for this country.</strong></td></tr>'; } for ($rs=0;$rs<count($GLOBALS["db_values"]);$rs++) { $extra_args = array(); $cur_count = $GLOBALS["db_values"][$rs]["count"]; if(isset($_REQUEST["year"])) { $extra_args[] = "year=".$_REQUEST["year"]; } if(isset($_REQUEST["month"])) { $extra_args[] = "month=".$_REQUEST["month"]; } if(isset($_REQUEST["range"])) { $extra_args[] = "range=".$_REQUEST["range"]; } // NJS 2005-12-15: subtly highlight every alternate row print '<tr'; if ($rs % 2) print ' style="background-color:#EDF3FE;"'; print '><td width="600" align="left" style="font-size:small;"><a href="'. $_SERVER['PHP_SELF']. '?action=show_detail_eprint;id='. $GLOBALS["db_values"][$rs]["archiveid"]. ';'. implode(";",$extra_args). '">'. $GLOBALS["db_values"][$rs]["eprint_name"]. '</a></td><td align="right" style="font-size:small;">'. $GLOBALS["db_values"][$rs]["count"]. '</td></tr>'; } print "</table>\n"; ?>

Ignore Space Show notes View

Repositories/statistics/includes/inc.html.show_detail_country.es.php

<?php
// NJS 2005-12-15
	require("inc.html.navbar_global.es.php");
?>

<h3>Document downloads from:
<?php
	print $show_country_name;

// select a flag
	print ' ';
	$c_flag = 'flags18x14/' . $show_country . '.png';
	if (file_exists($c_flag)) {
		print '<img src="'. $c_flag . '" width="18" height="14" alt="'. $show_country . '">';
	} else {
		print '<img src="flags18x14/unknown.png" width="18" height="14" alt="' . $show_country . '">';
	};
?></h3>

<?php
	if (isset ($GLOBALS["db_values"]["0"]["count"])) {
		print '<span style="font-size:small;">Click on a document title to see detailed statistics for that document</span>';
		print "<table cellspacing='0' cellpadding='4'>\n";
		print '<tr><th style="background-color:#cccccc;">Document</th>
			<th style="background-color:#4477dd;color:#ffffff;">Downloads</th></tr>';
	}
	else {
		print "<table cellspacing='0' cellpadding='4'>\n";
		print '<tr><td><strong style="color:#ff0000;">No downloads for this country.</strong></td></tr>';
	}
	for ($rs=0;$rs<count($GLOBALS["db_values"]);$rs++)
	{
		$extra_args = array();
		$cur_count = $GLOBALS["db_values"][$rs]["count"];
		if(isset($_REQUEST["year"])) { $extra_args[] = "year=".$_REQUEST["year"]; }
		if(isset($_REQUEST["month"])) { $extra_args[] = "month=".$_REQUEST["month"]; }
		if(isset($_REQUEST["range"])) { $extra_args[] = "range=".$_REQUEST["range"]; }
		// NJS 2005-12-15: subtly highlight every alternate row
		print '<tr';
		if ($rs % 2) print ' style="background-color:#EDF3FE;"';
		print '><td width="600" align="left" style="font-size:small;"><a href="'.
			$_SERVER['PHP_SELF'].
			'?action=show_detail_eprint;id='.
			$GLOBALS["db_values"][$rs]["archiveid"].
			';'.
			implode(";",$extra_args).
			'">'.
			$GLOBALS["db_values"][$rs]["eprint_name"].
			'</a></td><td align="right" style="font-size:small;">'.
			$GLOBALS["db_values"][$rs]["count"].
			'</td></tr>';
	}
	print "</table>\n";
?>

<?php
	require("inc.html.navbar_global.es.php");
?>

<h3>Document downloads from:
<?php
	print $show_country_name;

Ignore Space Show notes View Repositories/statistics/scripts/eprints-usage_src.php
<?php // NJS 2005-12-09 Switched to GeoIP from GeoIP:IPfree. include("geoip.inc"); $gi = geoip_open("##GEOIP_DATABASE##",GEOIP_STANDARD); /* Apache log for ePrints uses this format: LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined If the log format differs the regular expression matching would need to be adjusted. Parse: ip date YYYY MM DD archive ID / // Web server log files $log_dir = '##APACHE_LOG_LOCATION##'; $log_file = array( 'otago_eprints' => '##APACHE_LOG_NAME##', ); // eprintstats db $sqlserver = 'localhost'; $sqluser = 'eprintstatspriv'; $sqlpass = 'AuldGrizzel'; $sqldatabase = 'eprintstats'; // SQL details of your ePrints installation $sqlserver2 = 'localhost'; $sqluser2 = 'otago_eprints'; $sqlpass2 = 'DrSyntaxRidesAgain'; / NJS 2005-12-16 IP address ranges for your local Intranet(s). You can have multiple ranges of IP addresses, each with a different "country name", so that they will appear as separate entries in the by country stats pages. You should use a different country code for each range (ISO 3166-1 specifies the range XA through XZ as "user-assignable", so you can use codes from there as necessary), and create flag icons as appropriate. Each address range key is the name that will appear in the statistics database (the "country name"), followed by a comma, followed by the appropriate ISO 3166-1 country code as noted above. Each entry in the range is either a single IP address, or an array specifying a lower and upper bound for a contiguous IP address range (see example below). All IP addresses must be converted to long values using the ip2long() function before being stored. Note that address ranges may overlap. The script will use the first range that matches a given IP, so list the ranges in the correct order of precedence for your needs. Example: $local_IPs = array( 'Repository Admin,XA' => array( ip2long('192.168.1.5'), ip2long('192.168.1.22'), array( ip2long('192.168.1.30'), ip2long('192.168.1.35'), ), ), 'Our Intranet,XI' => array( array( lower => ip2long('192.168.1.0'), upper => ip2long('192.168.255.255'), ), ), ); 'Repository Admin' covers the IP addresses 192.168.1.5, 192.168.1.22 and the range 192.168.1.30 to 192.168.1.35, inclusive. 'Our Intranet' covers the range 192.168.1.0 to 192.168.255.255, inclusive. A machine will only match the 'Our Intranet' range if it first fails to match the 'Repository Admin' range. / $local_IPs = array( 'Repository Admin,XA' => array( ip2long('139.80.75.110'), // Nigel @ Uni ip2long('60.234.209.74'), // Nigel @ home ip2long('139.80.92.138'), // Monica & Jeremy ip2long('139.80.92.151'), // @ Uni ip2long('203.89.162.155'), // Monica @ home ip2long('139.80.81.50'), // eprints.otago.ac.nz ), 'Otago Intranet,XI' => array( array( 'lower' => ip2long('139.80.0.0'), 'upper' => ip2long('139.80.127.255'), ), ), ); ########################################### ## ## No configuration required below here. ## ########################################### $connect = mysql_pconnect ($sqlserver,$sqluser,$sqlpass); $db = mysql_select_db($sqldatabase,$connect) or die("Could not connect"); // First get the date of last update $query = "select lastproc from lastproc order by timeinsert desc limit 1"; $result = mysql_query($query,$connect); $num_rows = mysql_num_rows($result); if ($num_rows > 0) { $row = mysql_fetch_assoc($result); $lastproc = $row["lastproc"]; $datetestA = strtotime($lastproc); } else { $datetestA = 0; } $connect2 = mysql_connect($sqlserver2,$sqluser2,$sqlpass2); $counter = 1; foreach($log_file as $archivename=>$archivelog) { $logf = $log_dir . $archivelog; $archive_name = $archivename; $handle = fopen($logf, "r"); while (!feof($handle)) { $buffer = fgets($handle, 4096); // NJS 2005-11-25 Added regexp for EPrints short URLs. if ((preg_match("/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) - - \[(.?)\] \"GET \/archive\/0{1,8}(\d{1,4}).? HTTP\/1..\" 200 ./i",$buffer,$matches)) \|\| (preg_match("/^(\S{1,}\.\S{1,}\.\S{1,}\.\S{1,}) - - \[(.?)\] \"GET \/archive\/0{1,8}(\d{1,4}).? HTTP\/1..\" 200 ./i",$buffer,$matches)) \|\| (preg_match("/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) - - \[(.?)\] \"GET \/(\d{1,4}).? HTTP\/1..\" 200 ./i",$buffer,$matches))) { $counter++; $country_code = ''; $country_name = ''; $insertid = ''; $eprint_name = ''; $view_type = ''; $uniquebits = ''; $ip = $matches[1]; /* NJS 2005-12-16 Determine country code and name. Check whether the IP number falls into any of the local intranet ranges. If so, then use that. / $ip_long = ip2long($ip); $found_country = FALSE; foreach ($local_IPs as $id => $addresses) { foreach ($addresses as $ip_range) { if (is_array($ip_range)) // check against lower/upper bounds { $found_country = (($ip_long >= $ip_range['lower']) && ($ip_long <= $ip_range['upper'])); break; } else if (is_long($ip_range)) // data type sanity check { $found_country = ($ip_long == $ip_range); break; } else // something is seriously broken, ignore this entry { print "Unsupported data type " . gettype($ip_range) . " (value " . $ip_range . ") in \$local_IPs (expected long).\n"; continue; } } if ($found_country) { list($country_name, $country_code) = explode(',', $id); break; } } // Otherwise, fall back to GeoIP. if (!$found_country) { $country_code = geoip_country_code_by_addr($gi, $ip); $country_name = geoip_country_name_by_addr($gi, $ip); } // end NJS 2005-12-16 $date = $matches[2]; $archive = $matches[3]; $uniquebits = $buffer; $date = preg_replace("/:./","",$date); $date = preg_replace("/\//", " ", $date); $when = getdate(strtotime($date)); $request_date = $when["year"]."-".$when["mon"]."-".$when["mday"]; $datetestB = strtotime($request_date); if ($datetestB < $datetestA) continue; // NJS 2005-11-25 Added regexp for EPrints short URLs. if(preg_match("/GET \/archive\/0{1,8}\d{1,4}\/\d\d\//i",$buffer) \|\| preg_match("/GET \/\d{1,4}\/\d\d\//i",$buffer)) { $view_type = "download"; } else { $view_type = "abstract"; } if(isset($eprintname[$archive])) { $eprint_name = $eprintname[$archive]; } else { $eprint_name = getePrintName($archive_name,$archive); $eprintname[$archive] = $eprint_name; } if($eprint_name=='') { // Do nothing. } else { $eprint_name = mysql_escape_string($eprint_name); $query = " INSERT into view (uniquebits,archive_name,ip,request_date,archiveid,country_code,country_name,view_type,eprint_name) values('".$uniquebits."','".$archive_name."','".$ip."','".$request_date."',".$archive.",'".$country_code."','".$country_name."','".$view_type."','".$eprint_name."')"; $result = mysql_query($query,$connect); $insertid = mysql_insert_id($connect); } } else { // print "NO match" . "\n"; } } fclose($handle); } /* Keep track of where we are. Should avoid duplication of results if the script is run more than once on the same log file / $query = "INSERT into lastproc (lastproc) values('".$request_date."')"; $result = mysql_query($query,$connect); #print "Records counted: $counter\n"; #print "Last count: $request_date\n"; mysql_close($connect2); mysql_close($connect); function getePrintName($db,$eprintid) { global $connect2; $sqldatabase = $db; $db = mysql_select_db($sqldatabase,$connect2); $query3 = "select title from archive where eprintid = $eprintid"; $result3 = mysql_query($query3,$connect2); $row = mysql_fetch_assoc($result3); $row["title"] = trim($row["title"]); $row["title"] = preg_replace("/\s+/"," ",$row["title"]); return $row["title"]; } ?> <?php // NJS 2005-12-09 Switched to GeoIP from GeoIP:IPfree. include("geoip.inc"); $gi = geoip_open("##GEOIP_DATABASE##",GEOIP_STANDARD); / Apache log for ePrints uses this format: LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined If the log format differs the regular expression matching would need to be adjusted. Parse: ip date YYYY MM DD archive ID / // Web server log files $log_dir = '##APACHE_LOG_LOCATION##'; $log_file = array( 'otago_eprints' => '##APACHE_LOG_NAME##', ); // eprintstats db $sqlserver = 'localhost'; $sqluser = 'eprintstatspriv'; $sqlpass = 'AuldGrizzel'; $sqldatabase = 'eprintstats'; // SQL details of your ePrints installation $sqlserver2 = 'localhost'; $sqluser2 = 'otago_eprints'; $sqlpass2 = 'DrSyntaxRidesAgain'; / NJS 2005-12-16 IP address ranges for your local Intranet(s). You can have multiple ranges of IP addresses, each with a different "country name", so that they will appear as separate entries in the by country stats pages. Note that all sets are assigned the country code "T5", so they will all use the flag icon for your local installation. If this isn't what you want, you'll have to hack this yourself :) Each address range is is keyed off the name that will appear in the statistics database (the "country name"). Each entry in the range is either a single IP address, or an array specifying a lower and upper bound for a contiguous IP address range (see example below). All IP addresses must be converted to long values using the ip2long() function before being stored. Note that address ranges may overlap. The script will use the first range that matches a given IP, so list the ranges in the correct order of precedence for your needs. Example: $local_IPs = array( 'Repository Admin' => array( ip2long('192.168.1.5'), ip2long('192.168.1.22'), array( ip2long('192.168.1.30'), ip2long('192.168.1.35'), ), ), 'Our Intranet' => array( array( lower => ip2long('192.168.1.0'), upper => ip2long('192.168.255.255'), ), ), ); 'Repository Admin' covers the IP addresses 192.168.1.5, 192.168.1.22 and the range 192.168.1.30 to 192.168.1.35, inclusive. 'Our Intranet' covers the range 192.168.1.0 to 192.168.255.255, inclusive. A machine will only match the 'Our Intranet' range if it first fails to match the 'Repository Admin' range. / $local_IPs = array( 'Repository Admin' => array( ip2long('139.80.75.110'), // Nigel @ Uni ip2long('60.234.209.74'), // Nigel @ home ip2long('139.80.92.138'), // Monica & Jeremy ip2long('139.80.92.151'), // @ Uni ip2long('203.89.162.155'), // Monica @ home ip2long('139.80.81.50'), // eprints.otago.ac.nz ), 'Otago Intranet' => array( array( 'lower' => ip2long('139.80.0.0'), 'upper' => ip2long('139.80.127.255'), ), ), ); ########################################### ## ## No configuration required below here. ## ########################################### $connect = mysql_pconnect ($sqlserver,$sqluser,$sqlpass); $db = mysql_select_db($sqldatabase,$connect) or die("Could not connect"); // First get the date of last update $query = "select lastproc from lastproc order by timeinsert desc limit 1"; $result = mysql_query($query,$connect); $num_rows = mysql_num_rows($result); if ($num_rows > 0) { $row = mysql_fetch_assoc($result); $lastproc = $row["lastproc"]; $datetestA = strtotime($lastproc); } else { $datetestA = 0; } $connect2 = mysql_connect($sqlserver2,$sqluser2,$sqlpass2); $counter = 1; foreach($log_file as $archivename=>$archivelog) { $logf = $log_dir . $archivelog; $archive_name = $archivename; $handle = fopen($logf, "r"); while (!feof($handle)) { $buffer = fgets($handle, 4096); // NJS 2005-11-25 Added regexp for EPrints short URLs. if ((preg_match("/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) - - \[(.?)\] \"GET \/archive\/0{1,8}(\d{1,4}).? HTTP\/1..\" 200 ./i",$buffer,$matches)) \|\| (preg_match("/^(\S{1,}\.\S{1,}\.\S{1,}\.\S{1,}) - - \[(.?)\] \"GET \/archive\/0{1,8}(\d{1,4}).? HTTP\/1..\" 200 ./i",$buffer,$matches)) \|\| (preg_match("/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) - - \[(.?)\] \"GET \/(\d{1,4}).? HTTP\/1..\" 200 ./i",$buffer,$matches))) { $counter++; $country_code = ''; $country_name = ''; $insertid = ''; $eprint_name = ''; $view_type = ''; $uniquebits = ''; $ip = $matches[1]; /* NJS 2005-12-16 Determine country code and name. Check whether the IP number falls into any of the local intranet ranges. If so, then use that. / $ip_long = ip2long($ip); $found_country = FALSE; foreach ($local_IPs as $name => $addresses) { foreach ($addresses as $ip_range) { if (is_array($ip_range)) // check against lower/upper bounds { $found_country = (($ip_long >= $ip_range['lower']) && ($ip_long <= $ip_range['upper'])); break; } else if (is_long($ip_range)) // data type sanity check { $found_country = ($ip_long == $ip_range); break; } else // something is seriously broken, ignore this entry { print "Unsupported data type " . gettype($ip_range) . " (value " . $ip_range . ") in \$local_IPs (expected long).\n"; continue; } } if ($found_country) { $country_code = 'T5'; $country_name = $name; break; } } // Otherwise, fall back to GeoIP. if (!$found_country) { $country_code = geoip_country_code_by_addr($gi, $ip); $country_name = geoip_country_name_by_addr($gi, $ip); } // end NJS 2005-12-16 $date = $matches[2]; $archive = $matches[3]; $uniquebits = $buffer; $date = preg_replace("/:./","",$date); $date = preg_replace("/\//", " ", $date); $when = getdate(strtotime($date)); $request_date = $when["year"]."-".$when["mon"]."-".$when["mday"]; $datetestB = strtotime($request_date); if ($datetestB < $datetestA) continue; // NJS 2005-11-25 Added regexp for EPrints short URLs. if(preg_match("/GET \/archive\/0{1,8}\d{1,4}\/\d\d\//i",$buffer) \|\| preg_match("/GET \/\d{1,4}\/\d\d\//i",$buffer)) { $view_type = "download"; } else { $view_type = "abstract"; } if(isset($eprintname[$archive])) { $eprint_name = $eprintname[$archive]; } else { $eprint_name = getePrintName($archive_name,$archive); $eprintname[$archive] = $eprint_name; } if($eprint_name=='') { // Do nothing. } else { $eprint_name = mysql_escape_string($eprint_name); $query = " INSERT into view (uniquebits,archive_name,ip,request_date,archiveid,country_code,country_name,view_type,eprint_name) values('".$uniquebits."','".$archive_name."','".$ip."','".$request_date."',".$archive.",'".$country_code."','".$country_name."','".$view_type."','".$eprint_name."')"; $result = mysql_query($query,$connect); $insertid = mysql_insert_id($connect); } } else { // print "NO match" . "\n"; } } fclose($handle); } /* Keep track of where we are. Should avoid duplication of results if the script is run more than once on the same log file */ $query = "INSERT into lastproc (lastproc) values('".$request_date."')"; $result = mysql_query($query,$connect); #print "Records counted: $counter\n"; #print "Last count: $request_date\n"; mysql_close($connect2); mysql_close($connect); function getePrintName($db,$eprintid) { global $connect2; $sqldatabase = $db; $db = mysql_select_db($sqldatabase,$connect2); $query3 = "select title from archive where eprintid = $eprintid"; $result3 = mysql_query($query3,$connect2); $row = mysql_fetch_assoc($result3); $row["title"] = trim($row["title"]); $row["title"] = preg_replace("/\s+/"," ",$row["title"]); return $row["title"]; } ?>

Ignore Space Show notes View

Repositories/statistics/scripts/eprints-usage_src.php

<?php

// NJS 2005-12-09 Switched to GeoIP from GeoIP:IPfree.
include("geoip.inc");

$gi = geoip_open("##GEOIP_DATABASE##",GEOIP_STANDARD);

Apache log for ePrints uses this format:
	LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined

If the log format differs the regular expression matching would need to be adjusted.		
	
	Parse:
		ip
		date YYYY MM DD
		archive ID

// Web server log files
$log_dir = '##APACHE_LOG_LOCATION##';
$log_file = array(
	'otago_eprints' => '##APACHE_LOG_NAME##',
);

// eprintstats db
$sqlserver = 'localhost';
$sqluser = 'eprintstatspriv';
$sqlpass = 'AuldGrizzel';
$sqldatabase = 'eprintstats';

// SQL details of your ePrints installation
$sqlserver2 = 'localhost';
$sqluser2 = 'otago_eprints';
$sqlpass2 = 'DrSyntaxRidesAgain';

/* NJS 2005-12-16
IP address ranges for your local Intranet(s). You can have multiple
ranges of IP addresses, each with a different "country name", so that
they will appear as separate entries in the by country stats pages.
You should use a different country code for each range (ISO 3166-1
specifies the range XA through XZ as "user-assignable", so you can use
codes from there as necessary), and create flag icons as appropriate.

Each address range key is the name that will appear in the statistics
database (the "country name"), followed by a comma, followed by the
appropriate ISO 3166-1 country code as noted above. Each entry in the
range is either a single IP address, or an array specifying a lower and
upper bound for a contiguous IP address range (see example below).

All IP addresses must be converted to long values using the ip2long()
function before being stored.

Note that address ranges may overlap. The script will use the first
range that matches a given IP, so list the ranges in the correct order
of precedence for your needs.

Example:

$local_IPs = array(
	'Repository Admin,XA' => array(
		ip2long('192.168.1.5'),
		ip2long('192.168.1.22'),
		array(
			ip2long('192.168.1.30'),
			ip2long('192.168.1.35'),
		),
	),
	'Our Intranet,XI' => array(
		array(
			lower => ip2long('192.168.1.0'),
			upper => ip2long('192.168.255.255'),
		),
	),
);

'Repository Admin' covers the IP addresses 192.168.1.5, 192.168.1.22 and
the range 192.168.1.30 to 192.168.1.35, inclusive. 'Our Intranet' covers
the range 192.168.1.0 to 192.168.255.255, inclusive. A machine will only
match the 'Our Intranet' range if it first fails to match the
'Repository Admin' range.
*/
$local_IPs = array(
	'Repository Admin,XA' => array(
		ip2long('139.80.75.110'),  // Nigel @ Uni
		ip2long('60.234.209.74'),  // Nigel @ home
		ip2long('139.80.92.138'),  // Monica & Jeremy
		ip2long('139.80.92.151'),  //   @ Uni
		ip2long('203.89.162.155'), // Monica @ home
		ip2long('139.80.81.50'),   // eprints.otago.ac.nz
	),
	'Otago Intranet,XI' => array(
		array(
			'lower' => ip2long('139.80.0.0'),
			'upper' => ip2long('139.80.127.255'),
		),
	),
);

###########################################
##
## No configuration required below here.
##
###########################################

$connect = mysql_pconnect ($sqlserver,$sqluser,$sqlpass);
$db = mysql_select_db($sqldatabase,$connect) or die("Could not connect");

// First get the date of last update
$query = "select lastproc from lastproc order by timeinsert desc limit 1";
$result = mysql_query($query,$connect);
$num_rows = mysql_num_rows($result);
if ($num_rows > 0) {
	$row = mysql_fetch_assoc($result);
	$lastproc = $row["lastproc"];
	$datetestA = strtotime($lastproc);
}
else {
	$datetestA = 0;
}

$connect2 = mysql_connect($sqlserver2,$sqluser2,$sqlpass2);
$counter = 1;
foreach($log_file as $archivename=>$archivelog) {
	$logf = $log_dir . $archivelog;
	$archive_name = $archivename;
	$handle = fopen($logf, "r");
	while (!feof($handle)) {
		$buffer = fgets($handle, 4096);
		// NJS 2005-11-25 Added regexp for EPrints short URLs.
		if	((preg_match("/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) - - \[(.*?)\] \"GET \/archive\/0{1,8}(\d{1,4}).*? HTTP\/1..\" 200 .*/i",$buffer,$matches)) ||
			(preg_match("/^(\S{1,}\.\S{1,}\.\S{1,}\.\S{1,}) - - \[(.*?)\] \"GET \/archive\/0{1,8}(\d{1,4}).*? HTTP\/1..\" 200 .*/i",$buffer,$matches)) ||
			(preg_match("/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) - - \[(.*?)\] \"GET \/(\d{1,4}).*? HTTP\/1..\" 200 .*/i",$buffer,$matches)))
		{
			$counter++;
			$country_code = '';
			$country_name = '';
			$insertid = '';
			$eprint_name = '';
			$view_type = '';
			$uniquebits = '';
			$ip = $matches[1];
			
			/* NJS 2005-12-16
				Determine country code and name.
				Check whether the IP number falls into any of the local
				intranet ranges. If so, then use that.
			*/
			$ip_long = ip2long($ip);
			$found_country = FALSE;
			foreach ($local_IPs as $id => $addresses)
			{
				foreach ($addresses as $ip_range)
				{
					if (is_array($ip_range)) // check against lower/upper bounds
					{
						$found_country = (($ip_long >= $ip_range['lower']) 
							&& ($ip_long <= $ip_range['upper']));
						break;
					}
					else if (is_long($ip_range)) // data type sanity check
					{
						$found_country = ($ip_long == $ip_range);
						break;
					}
					else // something is seriously broken, ignore this entry
					{
						print "Unsupported data type " . gettype($ip_range) .
							" (value " . $ip_range .
							") in \$local_IPs (expected long).\n";
						continue; 
					}
				}
				
				if ($found_country)
				{
					list($country_name, $country_code) = explode(',', $id);
					break;
				}
			}
			
			// Otherwise, fall back to GeoIP.
			if (!$found_country)
			{
				$country_code = geoip_country_code_by_addr($gi, $ip);
				$country_name = geoip_country_name_by_addr($gi, $ip);
			}
			// end NJS 2005-12-16
			
			$date = $matches[2];
			$archive = $matches[3];
			$uniquebits = $buffer;
			$date = preg_replace("/:.*/","",$date);
			$date = preg_replace("/\//", " ", $date);
			$when = getdate(strtotime($date));
			$request_date = $when["year"]."-".$when["mon"]."-".$when["mday"];
			$datetestB = strtotime($request_date);
			if ($datetestB < $datetestA)
				continue;
			
			// NJS 2005-11-25 Added regexp for EPrints short URLs.
			if(preg_match("/GET \/archive\/0{1,8}\d{1,4}\/\d\d\//i",$buffer) || preg_match("/GET \/\d{1,4}\/\d\d\//i",$buffer)) {
				$view_type = "download";
			} else {
				$view_type = "abstract";
			}
			if(isset($eprintname[$archive])) {
				$eprint_name = $eprintname[$archive];
			} else {
				$eprint_name = getePrintName($archive_name,$archive);
				$eprintname[$archive] = $eprint_name;
			}
			if($eprint_name=='') {
				// Do nothing.
			} else {
				$eprint_name = mysql_escape_string($eprint_name);
				$query = "
				INSERT into view (uniquebits,archive_name,ip,request_date,archiveid,country_code,country_name,view_type,eprint_name)
				values('".$uniquebits."','".$archive_name."','".$ip."','".$request_date."',".$archive.",'".$country_code."','".$country_name."','".$view_type."','".$eprint_name."')";
				$result = mysql_query($query,$connect);
				$insertid = mysql_insert_id($connect);
			}

} else {
			// print "NO match" . "\n";
		}
	}
	fclose($handle);
}

/*
		Keep track of where we are. Should avoid duplication of results
		if the script is run more than once on the same log file
	*/

$query = "INSERT into lastproc (lastproc) values('".$request_date."')";
$result = mysql_query($query,$connect);

#print "Records counted: $counter\n";
#print "Last count: $request_date\n";
mysql_close($connect2);
mysql_close($connect);

function getePrintName($db,$eprintid) {
	global $connect2;
	$sqldatabase = $db;
	$db = mysql_select_db($sqldatabase,$connect2);
	$query3 = "select title from archive where eprintid = $eprintid";
	$result3 = mysql_query($query3,$connect2);
	$row = mysql_fetch_assoc($result3);
	$row["title"] = trim($row["title"]);
	$row["title"] = preg_replace("/\s+/"," ",$row["title"]);
	return $row["title"];
}

<?php

// NJS 2005-12-09 Switched to GeoIP from GeoIP:IPfree.
include("geoip.inc");

$gi = geoip_open("##GEOIP_DATABASE##",GEOIP_STANDARD);

Apache log for ePrints uses this format:
	LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined

If the log format differs the regular expression matching would need to be adjusted.		
	
	Parse:
		ip
		date YYYY MM DD
		archive ID

// Web server log files
$log_dir = '##APACHE_LOG_LOCATION##';
$log_file = array(
	'otago_eprints' => '##APACHE_LOG_NAME##',
);

// eprintstats db
$sqlserver = 'localhost';
$sqluser = 'eprintstatspriv';
$sqlpass = 'AuldGrizzel';
$sqldatabase = 'eprintstats';

// SQL details of your ePrints installation
$sqlserver2 = 'localhost';
$sqluser2 = 'otago_eprints';
$sqlpass2 = 'DrSyntaxRidesAgain';

/* NJS 2005-12-16
IP address ranges for your local Intranet(s). You can have multiple
ranges of IP addresses, each with a different "country name", so that
they will appear as separate entries in the by country stats pages. Note
that all sets are assigned the country code "T5", so they will all use
the flag icon for your local installation. If this isn't what you want,
you'll have to hack this yourself :)

Each address range is is keyed off the name that will appear in the
statistics database (the "country name"). Each entry in the range is
either a single IP address, or an array specifying a lower and upper
bound for a contiguous IP address range (see example below).

All IP addresses must be converted to long values using the ip2long()
function before being stored.

Note that address ranges may overlap. The script will use the first
range that matches a given IP, so list the ranges in the correct order
of precedence for your needs.

Example:

$local_IPs = array(
	'Repository Admin' => array(
		ip2long('192.168.1.5'),
		ip2long('192.168.1.22'),
		array(
			ip2long('192.168.1.30'),
			ip2long('192.168.1.35'),
		),
	),
	'Our Intranet' => array(
		array(
			lower => ip2long('192.168.1.0'),
			upper => ip2long('192.168.255.255'),
		),
	),
);

'Repository Admin' covers the IP addresses 192.168.1.5, 192.168.1.22 and
the range 192.168.1.30 to 192.168.1.35, inclusive. 'Our Intranet' covers
the range 192.168.1.0 to 192.168.255.255, inclusive. A machine will only
match the 'Our Intranet' range if it first fails to match the
'Repository Admin' range.
*/
$local_IPs = array(
	'Repository Admin' => array(
		ip2long('139.80.75.110'),  // Nigel @ Uni
		ip2long('60.234.209.74'),  // Nigel @ home
		ip2long('139.80.92.138'),  // Monica & Jeremy
		ip2long('139.80.92.151'),  //   @ Uni
		ip2long('203.89.162.155'), // Monica @ home
		ip2long('139.80.81.50'),   // eprints.otago.ac.nz
	),
	'Otago Intranet' => array(
		array(
			'lower' => ip2long('139.80.0.0'),
			'upper' => ip2long('139.80.127.255'),
		),
	),
);

###########################################
##
## No configuration required below here.
##
###########################################

$connect = mysql_pconnect ($sqlserver,$sqluser,$sqlpass);
$db = mysql_select_db($sqldatabase,$connect) or die("Could not connect");

$connect2 = mysql_connect($sqlserver2,$sqluser2,$sqlpass2);
$counter = 1;
foreach($log_file as $archivename=>$archivelog) {
	$logf = $log_dir . $archivelog;
	$archive_name = $archivename;
	$handle = fopen($logf, "r");
	while (!feof($handle)) {
		$buffer = fgets($handle, 4096);
		// NJS 2005-11-25 Added regexp for EPrints short URLs.
		if	((preg_match("/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) - - \[(.*?)\] \"GET \/archive\/0{1,8}(\d{1,4}).*? HTTP\/1..\" 200 .*/i",$buffer,$matches)) ||
			(preg_match("/^(\S{1,}\.\S{1,}\.\S{1,}\.\S{1,}) - - \[(.*?)\] \"GET \/archive\/0{1,8}(\d{1,4}).*? HTTP\/1..\" 200 .*/i",$buffer,$matches)) ||
			(preg_match("/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) - - \[(.*?)\] \"GET \/(\d{1,4}).*? HTTP\/1..\" 200 .*/i",$buffer,$matches)))
		{
			$counter++;
			$country_code = '';
			$country_name = '';
			$insertid = '';
			$eprint_name = '';
			$view_type = '';
			$uniquebits = '';
			$ip = $matches[1];
			
			/* NJS 2005-12-16
				Determine country code and name.
				Check whether the IP number falls into any of the local
				intranet ranges. If so, then use that.
			*/
			$ip_long = ip2long($ip);
			$found_country = FALSE;
			foreach ($local_IPs as $name => $addresses)
			{
				foreach ($addresses as $ip_range)
				{
					if (is_array($ip_range)) // check against lower/upper bounds
					{
						$found_country = (($ip_long >= $ip_range['lower']) 
							&& ($ip_long <= $ip_range['upper']));
						break;
					}
					else if (is_long($ip_range)) // data type sanity check
					{
						$found_country = ($ip_long == $ip_range);
						break;
					}
					else // something is seriously broken, ignore this entry
					{
						print "Unsupported data type " . gettype($ip_range) .
							" (value " . $ip_range .
							") in \$local_IPs (expected long).\n";
						continue; 
					}
				}
				
				if ($found_country)
				{
					$country_code = 'T5';
					$country_name = $name;
					break;
				}
			}
			
			// Otherwise, fall back to GeoIP.
			if (!$found_country)
			{
				$country_code = geoip_country_code_by_addr($gi, $ip);
				$country_name = geoip_country_name_by_addr($gi, $ip);
			}
			// end NJS 2005-12-16
			
			$date = $matches[2];
			$archive = $matches[3];
			$uniquebits = $buffer;
			$date = preg_replace("/:.*/","",$date);
			$date = preg_replace("/\//", " ", $date);
			$when = getdate(strtotime($date));
			$request_date = $when["year"]."-".$when["mon"]."-".$when["mday"];
			$datetestB = strtotime($request_date);
			if ($datetestB < $datetestA)
				continue;
			
			// NJS 2005-11-25 Added regexp for EPrints short URLs.
			if(preg_match("/GET \/archive\/0{1,8}\d{1,4}\/\d\d\//i",$buffer) || preg_match("/GET \/\d{1,4}\/\d\d\//i",$buffer)) {
				$view_type = "download";
			} else {
				$view_type = "abstract";
			}
			if(isset($eprintname[$archive])) {
				$eprint_name = $eprintname[$archive];
			} else {
				$eprint_name = getePrintName($archive_name,$archive);
				$eprintname[$archive] = $eprint_name;
			}
			if($eprint_name=='') {
				// Do nothing.
			} else {
				$eprint_name = mysql_escape_string($eprint_name);
				$query = "
				INSERT into view (uniquebits,archive_name,ip,request_date,archiveid,country_code,country_name,view_type,eprint_name)
				values('".$uniquebits."','".$archive_name."','".$ip."','".$request_date."',".$archive.",'".$country_code."','".$country_name."','".$view_type."','".$eprint_name."')";
				$result = mysql_query($query,$connect);
				$insertid = mysql_insert_id($connect);
			}

} else {
			// print "NO match" . "\n";
		}
	}
	fclose($handle);
}

/*
		Keep track of where we are. Should avoid duplication of results
		if the script is run more than once on the same log file
	*/

$query = "INSERT into lastproc (lastproc) values('".$request_date."')";
$result = mysql_query($query,$connect);

#print "Records counted: $counter\n";
#print "Last count: $request_date\n";
mysql_close($connect2);
mysql_close($connect);

Show line notes below