- Switched to machine-independent environment configuration.

nigel.stanger / Digital_Repository

Browse code - Switched to machine-independent environment configuration. master
1 parent fb5650b commit 3f66360ff5b06317b57e8eca0986ae53c4cc9963 nstanger authored on 12 Dec 2005

Patch

Showing 5 changed files

                Ignore Space
               Show notes
              View
            
          
          99 ■■■■■
          Repositories/statistics/Makefile
             SHELL=/bin/sh
 
EPRINTSSTATS:=/usr/local/eprints/ePrintsStats
# Load in machine-specific environment settings from environment_config.make.
# This include file MUST be created and MUST define the following variables:
#
# EPRINTSSTATS: /path/to/eprintsstats/installation
# EPRINTS_USER: the user that owns the EPrints directory
# EPRINTS_GROUP: the group that owns the EPrints directory
#
# EPRINTS_HOST: eprints host name
# EPRINTS_PORT: appropriate HTTP port
# EPRINTS_ADMIN_EMAIL: administrator email address (quote "@" with \)
#
# GEOIP_DATABASE:=/usr/local/share/GeoIP/GeoIP.dat
# 
# APACHE_LOG_LOCATION:=/sw/var/apache2/logs/
# APACHE_LOG_NAME:=access_log
# 
# PHP_LIB:=/sw/lib/php4
#
include environment_config.make
 
 
BINDIR:=$(EPRINTSSTATS)/scripts
 
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
FIX_SUBS:=GEOIP_DATABASE
VHOST_SUBS:=EPRINTSSTATS PHP_LIB
 
 
.PHONY: deploy stats
 
 
deploy:
deploy: $(GENERATED_FILES)
	@announce "Copying files..."
	@sudo rsync --verbose --cvs-exclude --exclude=Makefile \
		--exclude='*.make' --exclude='*_src.*' \
		--recursive --times . $(EPRINTSSTATS)
	@announce "Correcting ownership..."
	sudo chown -R www:www $(EPRINTSSTATS)
	sudo chown -R $(EPRINTS_USER):$(EPRINTS_GROUP) $(EPRINTSSTATS)
 
 
config/inc.vars.es.php: config/inc.vars.es_src.php
	@announce "Generating $@"
	perl -p $(foreach SUB,$(CONFIG_SUBS),-e "s|##$(SUB)##|$($(SUB))|g;") $< > $@
 
 
scripts/eprints-usage.php: scripts/eprints-usage_src.php
	@announce "Generating $@"
	perl -p $(foreach SUB,$(USAGE_SUBS),-e "s|##$(SUB)##|$($(SUB))|g;") $< > $@
 
 
scripts/fix-countries.php: scripts/fix-countries_src.php
	@announce "Generating $@"
	perl -p $(foreach SUB,$(FIX_SUBS),-e "s|##$(SUB)##|$($(SUB))|g;") $< > $@
 
 
vhost/apache.conf: vhost/apache_src.conf
	@announce "Generating $@"
	perl -p $(foreach SUB,$(VHOST_SUBS),-e "s|##$(SUB)##|$($(SUB))|g;") $< > $@
 
 
stats:
	@announce "Generating statistics..."
	@sudo -u www php $(BINDIR)/eprints-usage.php
	@sudo -u www perl $(BINDIR)/add_country.pl
	@sudo -u $(EPRINTS_USER) php $(BINDIR)/eprints-usage.php
#	@sudo -u $(EPRINTS_USER) perl $(BINDIR)/add_country.pl
 
 
debug:
	@echo "EPRINTSSTATS = [$(EPRINTSSTATS)]"
            SHELL=/bin/sh

# Load in machine-specific environment settings from environment_config.make.
# This include file MUST be created and MUST define the following variables:
#
# EPRINTSSTATS: /path/to/eprintsstats/installation
# EPRINTS_USER: the user that owns the EPrints directory
# EPRINTS_GROUP: the group that owns the EPrints directory
#
# EPRINTS_HOST: eprints host name
# EPRINTS_PORT: appropriate HTTP port
# EPRINTS_ADMIN_EMAIL: administrator email address (quote "@" with \)
#
# GEOIP_DATABASE:=/usr/local/share/GeoIP/GeoIP.dat
# 
# APACHE_LOG_LOCATION:=/sw/var/apache2/logs/
# APACHE_LOG_NAME:=access_log
# 
# PHP_LIB:=/sw/lib/php4
#
include environment_config.make


BINDIR:=$(EPRINTSSTATS)/scripts

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
FIX_SUBS:=GEOIP_DATABASE
VHOST_SUBS:=EPRINTSSTATS PHP_LIB


.PHONY: deploy stats


deploy: $(GENERATED_FILES)
	@announce "Copying files..."
	@sudo rsync --verbose --cvs-exclude --exclude=Makefile \
		--exclude='*.make' --exclude='*_src.*' \
		--recursive --times . $(EPRINTSSTATS)
	@announce "Correcting ownership..."
	sudo chown -R $(EPRINTS_USER):$(EPRINTS_GROUP) $(EPRINTSSTATS)


config/inc.vars.es.php: config/inc.vars.es_src.php
	@announce "Generating $@"
	perl -p $(foreach SUB,$(CONFIG_SUBS),-e "s|##$(SUB)##|$($(SUB))|g;") $< > $@


scripts/eprints-usage.php: scripts/eprints-usage_src.php
	@announce "Generating $@"
	perl -p $(foreach SUB,$(USAGE_SUBS),-e "s|##$(SUB)##|$($(SUB))|g;") $< > $@


scripts/fix-countries.php: scripts/fix-countries_src.php
	@announce "Generating $@"
	perl -p $(foreach SUB,$(FIX_SUBS),-e "s|##$(SUB)##|$($(SUB))|g;") $< > $@


vhost/apache.conf: vhost/apache_src.conf
	@announce "Generating $@"
	perl -p $(foreach SUB,$(VHOST_SUBS),-e "s|##$(SUB)##|$($(SUB))|g;") $< > $@


stats:
	@announce "Generating statistics..."
	@sudo -u $(EPRINTS_USER) php $(BINDIR)/eprints-usage.php
#	@sudo -u $(EPRINTS_USER) perl $(BINDIR)/add_country.pl


debug:
	@echo "EPRINTSSTATS = [$(EPRINTSSTATS)]"
	@echo "BINDIR = [$(BINDIR)]"

            SHELL=/bin/sh

EPRINTSSTATS:=/usr/local/eprints/ePrintsStats
BINDIR:=$(EPRINTSSTATS)/scripts


.PHONY: deploy stats


deploy:
	@announce "Copying files..."
	@sudo rsync --verbose --cvs-exclude --exclude=Makefile \
		--recursive --times . $(EPRINTSSTATS)
	@announce "Correcting ownership..."
	sudo chown -R www:www $(EPRINTSSTATS)


stats:
	@announce "Generating statistics..."
	@sudo -u www php $(BINDIR)/eprints-usage.php
	@sudo -u www perl $(BINDIR)/add_country.pl


debug:
	@echo "EPRINTSSTATS = [$(EPRINTSSTATS)]"
	@echo "BINDIR = [$(BINDIR)]"
 SHELL=/bin/sh
+EPRINTSSTATS:=/usr/local/eprints/ePrintsStats
+# Load in machine-specific environment settings from environment_config.make.
+# This include file MUST be created and MUST define the following variables:
+#
+# EPRINTSSTATS: /path/to/eprintsstats/installation
+# EPRINTS_USER: the user that owns the EPrints directory
+# EPRINTS_GROUP: the group that owns the EPrints directory
+#
+# EPRINTS_HOST: eprints host name
+# EPRINTS_PORT: appropriate HTTP port
+# EPRINTS_ADMIN_EMAIL: administrator email address (quote "@" with \)
+#
+# GEOIP_DATABASE:=/usr/local/share/GeoIP/GeoIP.dat
+#
+# APACHE_LOG_LOCATION:=/sw/var/apache2/logs/
+# APACHE_LOG_NAME:=access_log
+#
+# PHP_LIB:=/sw/lib/php4
+#
+include environment_config.make
 BINDIR:=$(EPRINTSSTATS)/scripts
+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
+FIX_SUBS:=GEOIP_DATABASE
+VHOST_SUBS:=EPRINTSSTATS PHP_LIB
 .PHONY: deploy stats
+deploy:
+deploy: $(GENERATED_FILES)
 	@announce "Copying files..."
 	@sudo rsync --verbose --cvs-exclude --exclude=Makefile \
+		--exclude='*.make' --exclude='*_src.*' \
 		--recursive --times . $(EPRINTSSTATS)
 	@announce "Correcting ownership..."
+	sudo chown -R www:www $(EPRINTSSTATS)
+	sudo chown -R $(EPRINTS_USER):$(EPRINTS_GROUP) $(EPRINTSSTATS)
+config/inc.vars.es.php: config/inc.vars.es_src.php
+	@announce "Generating $@"
+	perl -p $(foreach SUB,$(CONFIG_SUBS),-e "s|##$(SUB)##|$($(SUB))|g;") $< > $@
+scripts/eprints-usage.php: scripts/eprints-usage_src.php
+	@announce "Generating $@"
+	perl -p $(foreach SUB,$(USAGE_SUBS),-e "s|##$(SUB)##|$($(SUB))|g;") $< > $@
+scripts/fix-countries.php: scripts/fix-countries_src.php
+	@announce "Generating $@"
+	perl -p $(foreach SUB,$(FIX_SUBS),-e "s|##$(SUB)##|$($(SUB))|g;") $< > $@
+vhost/apache.conf: vhost/apache_src.conf
+	@announce "Generating $@"
+	perl -p $(foreach SUB,$(VHOST_SUBS),-e "s|##$(SUB)##|$($(SUB))|g;") $< > $@
 stats:
 	@announce "Generating statistics..."
+	@sudo -u www php $(BINDIR)/eprints-usage.php
+	@sudo -u www perl $(BINDIR)/add_country.pl
+	@sudo -u $(EPRINTS_USER) php $(BINDIR)/eprints-usage.php
+#	@sudo -u $(EPRINTS_USER) perl $(BINDIR)/add_country.pl
 debug:
 	@echo "EPRINTSSTATS = [$(EPRINTSSTATS)]"

                Ignore Space
               Show notes
              View
            
          
          8 ■■■■■
          Repositories/statistics/config/inc.vars.es_src.php
 		"filelocation" => array(
			"vTITLE" => "File locations",
			"vDESCRIPTION" => "Install directory and location of required files.",
			"base_install_dir" => array(
				"unix" => "/usr/local/eprints/ePrintsStats",
				"unix" => "##EPRINTSSTATS##",
				"windows" => "C:/ePrintsStats",
			),
			"base_log_dir" => "logs",
			"base_includes_dir" => "includes",
		"general" => array(
			"vTITLE" => "General progam details",
			"vDESCRIPTION" => "Admin name and contact, prog title",
			"admin_name" => "ePrints Administrator",
			"admin_email" => "admin@eprints.otago.ac.nz",
			"admin_email" => "##EPRINTS_ADMIN_EMAIL##",
			"support_name" => "ePrints Administrator",
			"support_email" => "admin@eprints.otago.ac.nz",
			"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.otago.ac.nz",
			"eprints_location" => "http://##EPRINTS_HOST##:##EPRINTS_PORT##",
			/* replaced admin_prog */
			"prog_address" => array(
				"public" => "index.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'),
					),
					/* 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",
			),
		),
		"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_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" => "/usr/local/eprints/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'),
					),
					/* 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" => "admin@eprints.otago.ac.nz",
			"support_name" => "ePrints Administrator",
			"support_email" => "admin@eprints.otago.ac.nz",
			"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.otago.ac.nz",
			/* replaced admin_prog */
			"prog_address" => array(
				"public" => "index.php",
			),
		),
		"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_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'),
				),
			),
		),
	);
 		"filelocation" => array(
 			"vTITLE" => "File locations",
 			"vDESCRIPTION" => "Install directory and location of required files.",
 			"base_install_dir" => array(
+				"unix" => "/usr/local/eprints/ePrintsStats",
+				"unix" => "##EPRINTSSTATS##",
 				"windows" => "C:/ePrintsStats",
 			),
 			"base_log_dir" => "logs",
 			"base_includes_dir" => "includes",
 		"general" => array(
 			"vTITLE" => "General progam details",
 			"vDESCRIPTION" => "Admin name and contact, prog title",
 			"admin_name" => "ePrints Administrator",
+			"admin_email" => "admin@eprints.otago.ac.nz",
+			"admin_email" => "##EPRINTS_ADMIN_EMAIL##",
 			"support_name" => "ePrints Administrator",
+			"support_email" => "admin@eprints.otago.ac.nz",
+			"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.otago.ac.nz",
+			"eprints_location" => "http://##EPRINTS_HOST##:##EPRINTS_PORT##",
 			/* replaced admin_prog */
 			"prog_address" => array(
 				"public" => "index.php",
 			),

Ignore Space Show notes View Repositories/statistics/scripts/eprints-usage_src.php
<?php 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'; // IP ranges for your local Intranet. Each pair represents the lower // and upper bound of the range, respectively. $local_name = 'Otago Intranet'; $local_IPs = 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); 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]; // Determine country code and name. // If the number falls into the local intranet range, then // use that instead of GeoIP. $ip_long = ip2long($ip); foreach ($local_IPs as $key => $range) { if (($ip_long >= $range['lower']) && ($ip_long <= $range['upper'])) { $country_code = 'T5'; $country_name = $local_name; } else { $country_code = geoip_country_code_by_addr($gi, $ip); $country_name = geoip_country_name_by_addr($gi, $ip); } } $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; 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 include("geoip.inc"); $gi = geoip_open("/usr/local/share/GeoIP/GeoIP.dat",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 = '/sw/var/apache2/logs/'; $log_file = array( 'otago_eprints' => 'access_log', ); // eprintstats db $sqlserver = 'localhost'; $sqluser = 'eprintstatspriv'; $sqlpass = 'AuldGrizzel'; $sqldatabase = 'eprintstats'; // SQL details of your ePrints installation $sqlserver2 = 'localhost'; $sqluser2 = 'otago_eprints'; $sqlpass2 = 'DrSyntaxRidesAgain'; // IP ranges for your local Intranet. Each pair represents the lower // and upper bound of the range, respectively. $local_name = 'Otago Intranet'; $local_IPs = 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); 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]; // Determine country code and name. // If the number falls into the local intranet range, then // use that instead of GeoIP. $ip_long = ip2long($ip); foreach ($local_IPs as $key => $range) { if (($ip_long >= $range['lower']) && ($ip_long <= $range['upper'])) { $country_code = 'T5'; $country_name = $local_name; } else { $country_code = geoip_country_code_by_addr($gi, $ip); $country_name = geoip_country_name_by_addr($gi, $ip); } } $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; 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

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';

// IP ranges for your local Intranet. Each pair represents the lower
// and upper bound of the range, respectively.
$local_name = 'Otago Intranet';
$local_IPs = 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);
		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];
			
			// Determine country code and name.
			// If the number falls into the local intranet range, then
			// use that instead of GeoIP.
			$ip_long = ip2long($ip);
			foreach ($local_IPs as $key => $range)
			{
				if (($ip_long >= $range['lower']) && ($ip_long <= $range['upper']))
				{
					$country_code = 'T5';
					$country_name = $local_name;
				}
				else
				{
					$country_code = geoip_country_code_by_addr($gi, $ip);
					$country_name = geoip_country_name_by_addr($gi, $ip);
				}
			}
			
			$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;
			
			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

include("geoip.inc");

$gi = geoip_open("/usr/local/share/GeoIP/GeoIP.dat",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 = '/sw/var/apache2/logs/';
$log_file = array(
	'otago_eprints' => 'access_log',
);