[csw-devel] SF.net SVN: gar:[20812] csw/mgar/gar/v2/lib/web/pkgdb_web.py
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Fri Apr 19 09:41:47 CEST 2013
Revision: 20812
http://gar.svn.sourceforge.net/gar/?rev=20812&view=rev
Author: wahwah
Date: 2013-04-19 07:41:47 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
pkgdb-web: Fixed a missed module change
Modified Paths:
--------------
csw/mgar/gar/v2/lib/web/pkgdb_web.py
Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py
===================================================================
--- csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-04-19 07:07:53 UTC (rev 20811)
+++ csw/mgar/gar/v2/lib/web/pkgdb_web.py 2013-04-19 07:41:47 UTC (rev 20812)
@@ -16,7 +16,6 @@
from lib.python import models
from lib.python import configuration
-from lib.python import pkgdb
from lib.python import checkpkg_lib
import datetime
from sqlobject import sqlbuilder
@@ -219,7 +218,7 @@
class CatalogDetail(object):
def GET(self, catrel_name, arch_name, osrel_name):
cat_name = " ".join((catrel_name, arch_name, osrel_name))
- sqo_osrel, sqo_arch, sqo_catrel = pkgdb.GetSqoTriad(
+ sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad(
osrel_name, arch_name, catrel_name)
t2 = time.time()
pkgs = models.GetCatPackagesResult(sqo_osrel, sqo_arch, sqo_catrel)
@@ -313,7 +312,7 @@
class Catalogs(object):
def GET(self, catrel_name, arch_name, osrel_name):
- sqo_osrel, sqo_arch, sqo_catrel = pkgdb.GetSqoTriad(
+ sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad(
osrel_name, arch_name, catrel_name)
pkgs = list(models.GetCatPackagesResult(sqo_osrel, sqo_arch, sqo_catrel))
user_data = web.input(quick='')
@@ -423,7 +422,7 @@
"""Get a srv4 reference by catalog ane catalogname."""
configuration.SetUpSqlobjectConnection()
try:
- sqo_osrel, sqo_arch, sqo_catrel = pkgdb.GetSqoTriad(
+ sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad(
osrel_name, arch_name, catrel_name)
except sqlobject.main.SQLObjectNotFound:
raise web.notfound()
@@ -458,7 +457,7 @@
def GET(self, catrel_name, arch_name, osrel_name, pkgname):
"""Get a srv4 reference by catalog ane pkgname."""
configuration.SetUpSqlobjectConnection()
- sqo_osrel, sqo_arch, sqo_catrel = pkgdb.GetSqoTriad(
+ sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad(
osrel_name, arch_name, catrel_name)
join = [
sqlbuilder.INNERJOINOn(None,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list