[Pymerase-cvs-commit] pymerase/pymerase/output CreateDbTableBrowser.py,1.3,1.4

[<ki...@us...>]

Update of /cvsroot/pymerase/pymerase/pymerase/output
In directory sc8-pr-cvs1:/tmp/cvs-serv20874

Modified Files:
	CreateDbTableBrowser.py 
Log Message:
Defaulted to loading all object, otherwise error is thrown.


Index: CreateDbTableBrowser.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/pymerase/output/CreateDbTableBrowser.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CreateDbTableBrowser.py	25 Jul 2003 02:03:20 -0000	1.3
--- CreateDbTableBrowser.py	25 Jul 2003 02:18:35 -0000	1.4
***************
*** 248,252 ****
  
    #FIXME: Need to have some way of overriding these values!
!   dbs = DBSession('localhost', 'arab_oligo', 'king')
    
    if query is not None and field is not None:
--- 248,252 ----
  
    #FIXME: Need to have some way of overriding these values!
!   dbs = DBSession('localhost', 'tabdata', 'king')
    
    if query is not None and field is not None:
***************
*** 271,279 ****
        objList = dbs.getObjectsWhere(dbs.%CLASS_NAME%, '%s' % (sqlSearch))
    else:
!     #objList = dbs.getAllObjects(dbs.%CLASS_NAME%)
!     tmpObj = dbs.%CLASS_NAME%()
!     objList = dbs.getObjectsWhere(dbs.%CLASS_NAME%,
!                                   '%s BETWEEN %s AND %s ORDER BY %s%s' % \\
!                                   (tmpObj.getPrimaryKeyName(), 1, 50, getField(sortField), sortDirect))
    return objList
    
--- 271,281 ----
        objList = dbs.getObjectsWhere(dbs.%CLASS_NAME%, '%s' % (sqlSearch))
    else:
!     objList = dbs.getAllObjects(dbs.%CLASS_NAME%)
!     #NOTE: Comment out the line above if number of objects is too large
!     # Then uncomment the 4 lines below
!     #tmpObj = dbs.%CLASS_NAME%()
!     #objList = dbs.getObjectsWhere(dbs.%CLASS_NAME%,
!     #                              '%s BETWEEN %s AND %s ORDER BY %s%s' % \\
!     #                              (tmpObj.getPrimaryKeyName(), 1, 50, getField(sortField), sortDirect))
    return objList