Skip to content

Commit

Permalink
*5256* Reduce include path to a single entry and change all import st…
Browse files Browse the repository at this point in the history 
…atements
  • Loading branch information
@fgrandel
fgrandel committed May 3, 2010
1 parent a5fe160 commit 3ed6257
Show file tree
Hide file tree
Showing 252 changed files with 606 additions and 580 deletions.
6 changes: 3 additions & 3 deletions classes/admin/form/PKPSiteSettingsForm.inc.php
View file
Expand Up @@ -19,7 +19,7 @@


define('SITE_MIN_PASSWORD_LENGTH', 4);
import('form.Form');
import('lib.pkp.classes.form.Form');

class PKPSiteSettingsForm extends Form {
/** @var $siteSettingsDao object Site settings DAO */
Expand Down Expand Up @@ -121,7 +121,7 @@ function execute() {
* Uploads custom site stylesheet.
*/
function uploadSiteStyleSheet() {
import('file.PublicFileManager');
import('classes.file.PublicFileManager');
$fileManager = new PublicFileManager();
$site =& Request::getSite();
if ($fileManager->uploadedFileExists('siteStyleSheet')) {
Expand All @@ -145,7 +145,7 @@ function uploadSiteStyleSheet() {
* Uploads custom site logo.
*/
function uploadPageHeaderTitleImage($locale) {
import('file.PublicFileManager');
import('classes.file.PublicFileManager');
$fileManager = new PublicFileManager();
$site =& Request::getSite();
if ($fileManager->uploadedFileExists('pageHeaderTitleImage')) {
Expand Down
2 changes: 1 addition & 1 deletion classes/announcement/PKPAnnouncementDAO.inc.php
View file
Expand Up @@ -13,7 +13,7 @@
* @brief Operations for retrieving and modifying Announcement objects.
*/

import('announcement.PKPAnnouncement');
import('lib.pkp.classes.announcement.PKPAnnouncement');

class PKPAnnouncementDAO extends DAO {
/**
Expand Down
2 changes: 1 addition & 1 deletion classes/announcement/PKPAnnouncementTypeDAO.inc.php
View file
Expand Up @@ -15,7 +15,7 @@

//$Id$

import('announcement.PKPAnnouncementType');
import('lib.pkp.classes.announcement.PKPAnnouncementType');

class PKPAnnouncementTypeDAO extends DAO {
/**
Expand Down
2 changes: 1 addition & 1 deletion classes/cache/APCCache.inc.php
View file
Expand Up @@ -16,7 +16,7 @@
// $Id$


import('cache.GenericCache');
import('lib.pkp.classes.cache.GenericCache');

class apc_false {};

Expand Down
10 changes: 5 additions & 5 deletions classes/cache/CacheManager.inc.php
View file
Expand Up @@ -16,7 +16,7 @@
// $Id$


import('cache.FileCache');
import('lib.pkp.classes.cache.FileCache');

define('CACHE_TYPE_FILE', 1);
define('CACHE_TYPE_OBJECT', 2);
Expand Down Expand Up @@ -73,19 +73,19 @@ function getCacheImplementation($type) {
function &getCache($context, $cacheId, $fallback, $type = CACHE_TYPE_FILE) {
switch ($this->getCacheImplementation($type)) {
case 'xcache':
import('cache.XCacheCache');
import('lib.pkp.classes.cache.XCacheCache');
$cache = new XCacheCache(
$context, $cacheId, $fallback
);
break;
case 'apc':
import('cache.APCCache');
import('lib.pkp.classes.cache.APCCache');
$cache = new APCCache(
$context, $cacheId, $fallback
);
break;
case 'memcache':
import('cache.MemcacheCache');
import('lib.pkp.classes.cache.MemcacheCache');
$cache = new MemcacheCache(
$context, $cacheId, $fallback,
Config::getVar('cache','memcache_hostname'),
Expand All @@ -97,7 +97,7 @@ function &getCache($context, $cacheId, $fallback, $type = CACHE_TYPE_FILE) {
$cache =& $this->getFileCache($context, $cacheId, $fallback);
break;
case 'none':
import('cache.GenericCache');
import('lib.pkp.classes.cache.GenericCache');
$cache = new GenericCache(
$context, $cacheId, $fallback
);
Expand Down
2 changes: 1 addition & 1 deletion classes/cache/FileCache.inc.php
View file
Expand Up @@ -19,7 +19,7 @@
// $Id$


import('cache.GenericCache');
import('lib.pkp.classes.cache.GenericCache');

class FileCache extends GenericCache {
/**
Expand Down
2 changes: 1 addition & 1 deletion classes/cache/MemcacheCache.inc.php
View file
Expand Up @@ -16,7 +16,7 @@
// $Id$


import('cache.GenericCache');
import('lib.pkp.classes.cache.GenericCache');

// FIXME This should use connection pooling
// WARNING: This cache MUST be loaded in batch, or else many cache
Expand Down
2 changes: 1 addition & 1 deletion classes/cache/XCacheCache.inc.php
View file
Expand Up @@ -16,7 +16,7 @@
// $Id$


import('cache.GenericCache');
import('lib.pkp.classes.cache.GenericCache');

class XCacheCache extends GenericCache {
/**
Expand Down
2 changes: 1 addition & 1 deletion classes/captcha/CaptchaDAO.inc.php
View file
Expand Up @@ -16,7 +16,7 @@
// $Id$


import('captcha.Captcha');
import('lib.pkp.classes.captcha.Captcha');

class CaptchaDAO extends DAO {
/**
Expand Down
2 changes: 1 addition & 1 deletion classes/captcha/CaptchaManager.inc.php
View file
Expand Up @@ -16,7 +16,7 @@
// $Id$


import('file.FileManager');
import('lib.pkp.classes.file.FileManager');

class CaptchaManager {
/**
Expand Down
6 changes: 3 additions & 3 deletions classes/citation/Citation.inc.php
View file
Expand Up @@ -25,9 +25,9 @@
define('CITATION_PARSED', 0x03);
define('CITATION_LOOKED_UP', 0x04);

import('core.DataObject');
import('metadata.nlm.NlmCitationSchema');
import('metadata.nlm.NlmCitationSchemaCitationAdapter');
import('lib.pkp.classes.core.DataObject');
import('lib.pkp.classes.metadata.nlm.NlmCitationSchema');
import('lib.pkp.classes.metadata.nlm.NlmCitationSchemaCitationAdapter');

class Citation extends DataObject {
/** @var int citation state (raw, edited, parsed, looked-up) */
Expand Down
2 changes: 1 addition & 1 deletion classes/citation/CitationDAO.inc.php
View file
Expand Up @@ -15,7 +15,7 @@

//$Id$

import('citation.Citation');
import('lib.pkp.classes.citation.Citation');

class CitationDAO extends DAO {
/**
Expand Down
2 changes: 1 addition & 1 deletion classes/citation/CitationListTokenizerFilter.inc.php
View file
Expand Up @@ -15,7 +15,7 @@

// $Id$

import('filter.Filter');
import('lib.pkp.classes.filter.Filter');

class CitationListTokenizerFilter extends Filter {
//
Expand Down
2 changes: 1 addition & 1 deletion classes/citation/NlmCitationDemultiplexerFilter.inc.php
View file
Expand Up @@ -14,7 +14,7 @@

// $Id$

import('filter.Filter');
import('lib.pkp.classes.filter.Filter');

class NlmCitationDemultiplexerFilter extends Filter {
/**
Expand Down
20 changes: 10 additions & 10 deletions classes/citation/NlmCitationSchemaFilter.inc.php
View file
Expand Up @@ -15,18 +15,18 @@

// $Id$

import('filter.Filter');
import('lib.pkp.classes.filter.Filter');

import('metadata.MetadataDescription');
import('metadata.nlm.NlmCitationSchema');
import('metadata.nlm.NlmNameSchema');
import('metadata.nlm.PersonStringNlmNameSchemaFilter');
import('metadata.DateStringNormalizerFilter');
import('lib.pkp.classes.metadata.MetadataDescription');
import('lib.pkp.classes.metadata.nlm.NlmCitationSchema');
import('lib.pkp.classes.metadata.nlm.NlmNameSchema');
import('lib.pkp.classes.metadata.nlm.PersonStringNlmNameSchemaFilter');
import('lib.pkp.classes.metadata.DateStringNormalizerFilter');

import('webservice.XmlWebService');
import('lib.pkp.classes.webservice.XmlWebService');

import('xml.XMLHelper');
import('xslt.XSLTransformationFilter');
import('lib.pkp.classes.xml.XMLHelper');
import('lib.pkp.classes.xslt.XSLTransformationFilter');

class NlmCitationSchemaFilter extends Filter {
/** @var array */
Expand Down Expand Up @@ -129,7 +129,7 @@ function constructSearchStrings(&$searchTemplates, &$citationDescription) {
$firstAuthorSurname = (string)$authors[0]->getStatement('surname');

// Convert first authors' name description to a string
import('metadata.nlm.NlmNameSchemaPersonStringFilter');
import('lib.pkp.classes.metadata.nlm.NlmNameSchemaPersonStringFilter');
$personStringFilter = new NlmNameSchemaPersonStringFilter();
$firstAuthor = $personStringFilter->execute($authors[0]);
}
Expand Down
4 changes: 2 additions & 2 deletions classes/citation/lookup/crossref/CrossrefNlmCitationSchemaFilter.inc.php
View file
Expand Up @@ -20,7 +20,7 @@

// $Id$

import('citation.NlmCitationSchemaFilter');
import('lib.pkp.classes.citation.NlmCitationSchemaFilter');

define('CROSSREF_WEBSERVICE_URL', 'http://www.crossref.org/openurl/');

Expand Down Expand Up @@ -110,7 +110,7 @@ function &_prepareOpenUrlSearch(&$citationDescription) {
$nullVar = null;

// Crosswalk to OpenURL
import('metadata.nlm.NlmCitationSchemaOpenUrlCrosswalkFilter');
import('lib.pkp.classes.metadata.nlm.NlmCitationSchemaOpenUrlCrosswalkFilter');
$nlmOpenUrlFilter = new NlmCitationSchemaOpenUrlCrosswalkFilter();
if (is_null($openUrlCitation =& $nlmOpenUrlFilter->execute($citationDescription))) return $nullVar;

Expand Down
2 changes: 1 addition & 1 deletion classes/citation/lookup/isbndb/IsbndbIsbnNlmCitationSchemaFilter.inc.php
View file
Expand Up @@ -15,7 +15,7 @@

// $Id$

import('citation.lookup.isbndb.IsbndbNlmCitationSchemaFilter');
import('lib.pkp.classes.citation.lookup.isbndb.IsbndbNlmCitationSchemaFilter');

class IsbndbIsbnNlmCitationSchemaFilter extends IsbndbNlmCitationSchemaFilter {
/*
Expand Down
2 changes: 1 addition & 1 deletion classes/citation/lookup/isbndb/IsbndbNlmCitationSchemaFilter.inc.php
View file
Expand Up @@ -20,7 +20,7 @@

define('ISBNDB_WEBSERVICE_URL', 'http://isbndb.com/api/books.xml');

import('citation.NlmCitationSchemaFilter');
import('lib.pkp.classes.citation.NlmCitationSchemaFilter');

class IsbndbNlmCitationSchemaFilter extends NlmCitationSchemaFilter {
/** @var string ISBNdb API key */
Expand Down
2 changes: 1 addition & 1 deletion classes/citation/lookup/isbndb/IsbndbNlmCitationSchemaIsbnFilter.inc.php
View file
Expand Up @@ -15,7 +15,7 @@

// $Id$

import('citation.lookup.isbndb.IsbndbNlmCitationSchemaFilter');
import('lib.pkp.classes.citation.lookup.isbndb.IsbndbNlmCitationSchemaFilter');

class IsbndbNlmCitationSchemaIsbnFilter extends IsbndbNlmCitationSchemaFilter {
/*
Expand Down
4 changes: 2 additions & 2 deletions classes/citation/lookup/pubmed/PubmedNlmCitationSchemaFilter.inc.php
View file
Expand Up @@ -20,7 +20,7 @@

// $Id$

import('citation.NlmCitationSchemaFilter');
import('lib.pkp.classes.citation.NlmCitationSchemaFilter');

define('PUBMED_WEBSERVICE_ESEARCH', 'http://eutils.ncbi.nlm.nih.gov/entrez/eutils/esearch.fcgi');
define('PUBMED_WEBSERVICE_EFETCH', 'http://eutils.ncbi.nlm.nih.gov/entrez/eutils/efetch.fcgi');
Expand Down Expand Up @@ -79,7 +79,7 @@ function &process(&$citationDescription) {
// 1) Try a "loose" search based on the author list.
// (This works surprisingly well for pubmed.)
$authors =& $citationDescription->getStatement('person-group[@person-group-type="author"]');
import('metadata.nlm.NlmNameSchemaPersonStringFilter');
import('lib.pkp.classes.metadata.nlm.NlmNameSchemaPersonStringFilter');
$personNameFilter = new NlmNameSchemaPersonStringFilter(PERSON_STRING_FILTER_MULTIPLE, '%firstname%%initials%%prefix% %surname%%suffix%', ', ');
$authorsString = (string)$personNameFilter->execute($authors);
if (!empty($authorsString)) {
Expand Down
2 changes: 1 addition & 1 deletion classes/citation/lookup/worldcat/WorldcatNlmCitationSchemaFilter.inc.php
View file
Expand Up @@ -20,7 +20,7 @@

// $Id$

import('citation.NlmCitationSchemaFilter');
import('lib.pkp.classes.citation.NlmCitationSchemaFilter');

// TODO: Might wish to change this if the publication type is NLM_PUBLICATION_TYPE_BOOK, etc. for advanced search
define('WORLDCAT_WEBSERVICE_SEARCH', 'http://www.worldcat.org/search');
Expand Down
2 changes: 1 addition & 1 deletion classes/citation/output/abnt/NlmCitationSchemaAbntFilter.inc.php
View file
Expand Up @@ -19,7 +19,7 @@

// $Id$

import('metadata.nlm.NlmCitationSchemaCitationOutputFormatFilter');
import('lib.pkp.classes.metadata.nlm.NlmCitationSchemaCitationOutputFormatFilter');

class NlmCitationSchemaAbntFilter extends NlmCitationSchemaCitationOutputFormatFilter {
/**
Expand Down
2 changes: 1 addition & 1 deletion classes/citation/output/apa/NlmCitationSchemaApaFilter.inc.php
View file
Expand Up @@ -19,7 +19,7 @@

// $Id$

import('metadata.nlm.NlmCitationSchemaCitationOutputFormatFilter');
import('lib.pkp.classes.metadata.nlm.NlmCitationSchemaCitationOutputFormatFilter');

class NlmCitationSchemaApaFilter extends NlmCitationSchemaCitationOutputFormatFilter {
/**
Expand Down
2 changes: 1 addition & 1 deletion classes/citation/parser/freecite/FreeciteRawCitationNlmCitationSchemaFilter.inc.php
View file
Expand Up @@ -19,7 +19,7 @@

// $Id$

import('citation.NlmCitationSchemaFilter');
import('lib.pkp.classes.citation.NlmCitationSchemaFilter');

define('FREECITE_WEBSERVICE', 'http://freecite.library.brown.edu/citations/create');

Expand Down
8 changes: 4 additions & 4 deletions classes/citation/parser/paracite/ParaciteRawCitationNlmCitationSchemaFilter.inc.php
View file
Expand Up @@ -30,10 +30,10 @@

// $Id$

import('citation.NlmCitationSchemaFilter');
import('metadata.nlm.OpenUrlNlmCitationSchemaCrosswalkFilter');
import('metadata.openurl.OpenUrlBookSchema');
import('metadata.openurl.OpenUrlJournalSchema');
import('lib.pkp.classes.citation.NlmCitationSchemaFilter');
import('lib.pkp.classes.metadata.nlm.OpenUrlNlmCitationSchemaCrosswalkFilter');
import('lib.pkp.classes.metadata.openurl.OpenUrlBookSchema');
import('lib.pkp.classes.metadata.openurl.OpenUrlJournalSchema');

define('CITATION_PARSER_PARACITE_STANDARD', 'Standard');
define('CITATION_PARSER_PARACITE_CITEBASE', 'Citebase');
Expand Down
2 changes: 1 addition & 1 deletion classes/citation/parser/parscit/ParscitRawCitationNlmCitationSchemaFilter.inc.php
View file
Expand Up @@ -19,7 +19,7 @@

// $Id$

import('citation.NlmCitationSchemaFilter');
import('lib.pkp.classes.citation.NlmCitationSchemaFilter');

define('PARSCIT_WEBSERVICE', 'http://aye.comp.nus.edu.sg/parsCit/parsCit.cgi');

Expand Down
2 changes: 1 addition & 1 deletion classes/citation/parser/regex/RegexRawCitationNlmCitationSchemaFilter.inc.php
View file
Expand Up @@ -23,7 +23,7 @@

// $Id$

import('citation.NlmCitationSchemaFilter');
import('lib.pkp.classes.citation.NlmCitationSchemaFilter');

class RegexRawCitationNlmCitationSchemaFilter extends NlmCitationSchemaFilter {
/*
Expand Down
4 changes: 2 additions & 2 deletions classes/cliTool/CliTool.inc.php
View file
Expand Up @@ -29,7 +29,7 @@
define('STDIN', fopen('php://stdin','r'));
}
define('SESSION_DISABLE_INIT', 1);
require('lib/pkp/includes/bootstrap.inc.php');
require('./lib/pkp/includes/bootstrap.inc.php');

if (!isset($argc)) {
// In PHP < 4.3.0 $argc/$argv are not automatically registered
Expand All @@ -55,7 +55,7 @@ function CommandLineTool($argv = array()) {
$request =& $application->getRequest();

// FIXME: Write and use a CLIRouter here (see classdoc)
import('core.PageRouter');
import('classes.core.PageRouter');
$router = new PageRouter();
$router->setApplication($application);
$request->setRouter($router);
Expand Down
8 changes: 4 additions & 4 deletions classes/cliTool/InstallTool.inc.php
View file
Expand Up @@ -15,10 +15,10 @@
// $Id$


import('install.Install');
import('install.form.InstallForm');
import('site.Version');
import('site.VersionCheck');
import('classes.install.Install');
import('classes.install.form.InstallForm');
import('lib.pkp.classes.site.Version');
import('lib.pkp.classes.site.VersionCheck');

class InstallTool extends CommandLineTool {

Expand Down
4 changes: 2 additions & 2 deletions classes/cliTool/ScheduledTaskTool.inc.php
View file
Expand Up @@ -18,8 +18,8 @@
/** Default XML tasks file to parse if none is specified */
define('TASKS_REGISTRY_FILE', Config::getVar('general', 'registry_dir') . '/scheduledTasks.xml');

import('scheduledTask.ScheduledTask');
import('scheduledTask.ScheduledTaskDAO');
import('lib.pkp.classes.scheduledTask.ScheduledTask');
import('lib.pkp.classes.scheduledTask.ScheduledTaskDAO');

class ScheduledTaskTool extends CommandLineTool {
/** @var string the XML file listing the tasks to be executed */
Expand Down

0 comments on commit 3ed6257

Please sign in to comment.