java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 43 -----
java/code/src/com/redhat/rhn/frontend/dto/ISOCategory.java | 73
----------
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 37 -----
3 files changed, 153 deletions(-)
New commits:
commit 90f0e1fa95bddd2da4b76350ab472b2deb006bb3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Oct 29 14:04:15 2010 +0200
Queries channel_download_categories_by_type and
satellite_channel_download_categories_by_type not used after previous removal, removing.
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
index 8b6511e..3082157 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
@@ -189,26 +189,6 @@ ORDER BY C.parent_channel NULLS LAST, UPPER(C.name)
</mode>
-<mode name="channel_download_categories_by_type"
class="com.redhat.rhn.frontend.dto.ISOCategory">
- <query params="channel_label, download_type, org_id">
-SELECT RD.category AS CATEGORY, MIN(ordering) AS MIN_ORDER
- FROM rhnDownloads RD,
- rhnDownloadType DT,
- rhnAvailableChannels AC,
- rhnChannelDownloads CD,
- rhnChannel C
- WHERE AC.org_id = :org_id
- AND RD.id = CD.downloads_id
- AND CD.channel_id = C.id
- AND C.label = :channel_label
- AND C.id = AC.channel_id
- AND DT.id = RD.download_type
- AND DT.label = :download_type
-GROUP BY RD.category
-ORDER BY MIN(ordering)
- </query>
-</mode>
-
<mode name="channel_downloads_by_type"
class="com.redhat.rhn.frontend.dto.ISOImage">
<query params="channel_label, download_type, org_id" >
SELECT RD.name AS DOWNLOAD_NAME,
@@ -244,29 +224,6 @@ SELECT FL.file_id id, FL.location LOCATIONS
</mode>
-<mode name="satellite_channel_download_categories_by_type"
class="com.redhat.rhn.frontend.dto.ISOCategory">
- <query params="channel_label, download_type, org_id">
-SELECT RD.category AS CATEGORY, MIN(ordering) AS MIN_ORDER
- FROM rhnDownloads RD,
- rhnDownloadType DT,
- rhnSatelliteChannelFamily SCF,
- rhnServer S,
- rhnChannelDownloads CD,
- rhnChannel C
- WHERE S.org_id = :org_id
- AND S.id = SCF.server_id
- AND RD.id = CD.downloads_id
- AND CD.channel_id = C.id
- AND C.label = :channel_label
- AND RD.channel_family_id = SCF.channel_family_id
- AND DT.id = RD.download_type
- AND DT.label = :download_type
-GROUP BY RD.category
-ORDER BY MIN(ordering)
- </query>
-</mode>
-
-
<mode name="satellite_channel_downloads_by_type"
class="com.redhat.rhn.frontend.dto.ISOImage">
<query params="org_id, channel_label, download_type">
SELECT DISTINCT RF.id AS ID,
commit a6468917729223a3111cc6f83b3cfd44dcf24953
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Oct 29 14:02:50 2010 +0200
ISOCategory not referenced, removing.
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/ISOCategory.java
b/java/code/src/com/redhat/rhn/frontend/dto/ISOCategory.java
deleted file mode 100644
index b84cea5..0000000
--- a/java/code/src/com/redhat/rhn/frontend/dto/ISOCategory.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * Copyright (c) 2009--2010 Red Hat, Inc.
- *
- * This software is licensed to you under the GNU General Public License,
- * version 2 (GPLv2). There is NO WARRANTY for this software, express or
- * implied, including the implied warranties of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
- * along with this software; if not, see
- *
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * Red Hat trademarks are not licensed under GPLv2. No permission is
- * granted to use or replicate Red Hat trademarks that are incorporated
- * in this software or its documentation.
- */
-package com.redhat.rhn.frontend.dto;
-
-
-/**
- * ISOCategory - handles DataResult return from
- * channel_queries.channel_download_categories_by_type
- * @version $Rev$
- */
-public class ISOCategory extends BaseDto {
- private String category;
- private Long minOrder;
-
- /**
- * {@inheritDoc}
- */
- public Long getId() {
- return minOrder;
- }
-
- /**
- * Get the category-name
- * @return category
- */
- public String getCategory() {
- return category;
- }
-
- /**
- * Set category-name
- * @param cat category-name to set
- */
- public void setCategory(String cat) {
- category = cat;
- }
-
- /**
- * Get smallest ordering-number for thall ISOs i nthis category
- * @return min-order
- */
- public Long getMinOrder() {
- return minOrder;
- }
-
- /**
- * Set min-order
- * @param min minOrder to set
- */
- public void setMinOrder(Long min) {
- minOrder = min;
- }
-
- /**
- * Set an ID for this category
- * @param newId new id
- */
- public void setId(Long newId) {
- this.minOrder = newId;
- }
-}
commit 175cf2ed1f9c4cb1e4436996226656e1542dd638
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Oct 29 14:02:17 2010 +0200
The listDownloadCategories is not used, removing.
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
index 47d1002..31ef700 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
@@ -1817,43 +1817,6 @@ public class ChannelManager extends BaseManager {
}
/**
- * Return a list of categories available for download
- * @param u User making the request
- * @param channelLabel channel to download from
- * @param downloadType download-type to look for (typically "iso")
- * @param lc associated list-control (if any)
- * @param forSatellite true if we want satellite-related categories
- * @return DataResult<ISOCategory>
- */
- public static DataResult listDownloadCategories(
- User u,
- String channelLabel, String downloadType, ListControl lc,
- boolean forSatellite) {
- SelectMode m = null;
-
- if (forSatellite) {
- m = ModeFactory.getMode("Channel_queries",
- "satellite_channel_download_categories_by_type");
- }
- else {
- m = ModeFactory.getMode("Channel_queries",
- "channel_download_categories_by_type");
- }
-
- Map params = new HashMap();
- params.put("org_id", u.getOrg().getId());
- params.put("channel_label", channelLabel);
- params.put("download_type", downloadType);
- DataResult dr = makeDataResult(params, params, lc, m);
- if (dr.size() == 0) {
- return null;
- }
- else {
- return dr;
- }
- }
-
- /**
* Return a list of all downlaods available for download from the specified channel
* @param u User making the request
* @param channelLabel label of channel of interest