some update regarding common tables

This commit is contained in:
Miroslav Stampar 2010-10-29 09:00:51 +00:00
parent 895efd28a6
commit d75578c81f
4 changed files with 63 additions and 7 deletions

View File

@ -232,6 +232,9 @@ Enrico Milanese <enricomilanese@gmail.com>
Anton Mogilin <azarmaster81@yahoo.com> Anton Mogilin <azarmaster81@yahoo.com>
for reporting a few bugs for reporting a few bugs
Anastasios Monachos <anastasiosm@gmail.com>
for providing some useful data
Alejo Murillo Moya <alex@65535.com> Alejo Murillo Moya <alex@65535.com>
for suggesting a feature for suggesting a feature

View File

@ -1309,15 +1309,16 @@ def initCommonOutputs():
cfile.close() cfile.close()
def getFileItems(filename): def getFileItems(filename, commentPrefix='#'):
retVal = [] retVal = []
checkFile(filename) checkFile(filename)
ifile = codecs.open(filename, 'r', conf.dataEncoding) ifile = codecs.open(filename, 'r', conf.dataEncoding)
for line in ifile.readlines(): # xreadlines doesn't return unicode strings when codec.open() is used for line in ifile.readlines(): # xreadlines doesn't return unicode strings when codec.open() is used
if line.find('#') != -1: if commentPrefix:
line = line[:line.find('#')] if line.find(commentPrefix) != -1:
line = line[:line.find(commentPrefix)]
line = line.strip() line = line.strip()
if line: if line:
retVal.append(line) retVal.append(line)

View File

@ -827,7 +827,7 @@ class Enumeration:
return kb.data.cachedTables return kb.data.cachedTables
def tableExists(self, tableFile): def tableExists(self, tableFile):
tables = getFileItems(tableFile) tables = getFileItems(tableFile, None)
retVal = [] retVal = []
infoMsg = "checking tables existence using items from '%s'" % tableFile infoMsg = "checking tables existence using items from '%s'" % tableFile
logger.info(infoMsg) logger.info(infoMsg)

View File

@ -1637,6 +1637,7 @@ SPACE
geo_Sea geo_Sea
DATA_ORG DATA_ORG
Contributor Contributor
jos_vm_product_download jos_vm_product_download
jos_vm_coupons jos_vm_coupons
jos_vm_product_reviews jos_vm_product_reviews
@ -1721,6 +1722,7 @@ jos_vm_product_relations
jos_core_acl_aro_sections jos_core_acl_aro_sections
jos_vm_order_history jos_vm_order_history
jos_banner jos_banner
php_users php_users
ALL_USERS ALL_USERS
banned_users banned_users
@ -1728,3 +1730,53 @@ users_tmp
users_club users_club
publicusers publicusers
cmsusers cmsusers
blacklist
cost
moves
pelates
tamio
tameio
xristes
zones
tamio_pelates
kwdikos
addressbookgrp
sendmsgs
publicationauthor
publicationfile
topicpublication
userrights
comp_group
computers_ID
event_log
networking
routing
software_licenses
ips
arxeia
SMS_TABLE
TABLE_PRIVILEGE_MAP
AMUSER
CONTACTTYPE
CONTENT
DOWNLOADGROUP
DOWNLOADS
DOWNLOADTYPE
EMAIL
ENQUIRY
FACTSHEET
FUND
FUNDGROUP
HISTORY
MANAGEMENTGROUP
SUBSCRIBE
TBLUSERS
TBLLIST
TBLLOG
TBLPROFILES
TBLREPORTS
TBLTRANSACTIONS
TBLRETAILUSERS
TBLCORPUSERS
TBLCORPORATEUSERS