Index: src/web/src/org/opennms/web/outage/OutageModel.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/web/src/org/opennms/web/outage/OutageModel.java,v
retrieving revision 1.11
diff -u -r1.11 OutageModel.java
--- src/web/src/org/opennms/web/outage/OutageModel.java	7 Oct 2004 20:23:23 -0000	1.11
+++ src/web/src/org/opennms/web/outage/OutageModel.java	20 Oct 2004 12:23:54 -0000
@@ -80,7 +80,7 @@
         try {
             Statement stmt = conn.createStatement();
             ResultSet rs = stmt.executeQuery(
-                    "select distinct outages.nodeId, node.nodeLabel, outages.ipaddr, ipinterface.iphostname, service.servicename, outages.serviceId, outages.iflostservice, outages.svclosteventid, notifications.notifyId, notifications.answeredBy from outages " +
+                    "select distinct outages.outageid, outages.nodeId, node.nodeLabel, outages.ipaddr, ipinterface.iphostname, service.servicename, outages.serviceId, outages.iflostservice, outages.svclosteventid, notifications.notifyId, notifications.answeredBy from outages " +
                     "left outer join notifications on (outages.svclosteventid=notifications.eventid), node, ipinterface, ifservices, service " +
                     "where ifregainedservice is null " +
                     "and (node.nodeid=outages.nodeid and ipinterface.ipaddr=outages.ipaddr and ifservices.serviceid=outages.serviceid) " +
@@ -138,7 +138,7 @@
 
         try {
             PreparedStatement stmt = conn.prepareStatement(
-                    "SELECT DISTINCT outages.iflostservice, outages.ifregainedservice, outages.nodeID, node.nodeLabel, outages.ipaddr, ipinterface.iphostname, service.servicename, outages.serviceId " +
+                    "SELECT DISTINCT outages.outageid, outages.iflostservice, outages.ifregainedservice, outages.nodeID, node.nodeLabel, outages.ipaddr, ipinterface.iphostname, service.servicename, outages.serviceId " +
                     "from outages, node, ipinterface, service " +
                     "where outages.nodeid=? " +
                     "and node.nodeid=outages.nodeid and outages.serviceid=service.serviceid and ipinterface.ipaddr=outages.ipaddr " +
@@ -167,7 +167,7 @@
 
         try {
             PreparedStatement stmt = conn.prepareStatement(
-                    "SELECT DISTINCT outages.iflostservice, outages.ifregainedservice, outages.nodeID, node.nodeLabel, outages.ipaddr, ipinterface.iphostname, service.servicename, outages.serviceId " +
+                    "SELECT DISTINCT outages.outageid, outages.iflostservice, outages.ifregainedservice, outages.nodeID, node.nodeLabel, outages.ipaddr, ipinterface.iphostname, service.servicename, outages.serviceId " +
                     "from outages, node, ipinterface, service " +
                     "where outages.nodeid=? " +
                     "and node.nodeid=outages.nodeid and outages.serviceid=service.serviceid and ipinterface.ipaddr=outages.ipaddr " +
@@ -199,7 +199,7 @@
 
         try {
             PreparedStatement stmt = conn.prepareStatement(
-                    "SELECT DISTINCT outages.iflostservice, outages.ifregainedservice, outages.nodeID, node.nodeLabel, outages.ipaddr, ipinterface.iphostname, service.servicename, outages.serviceId " +
+                    "SELECT DISTINCT outages.outageid, outages.iflostservice, outages.ifregainedservice, outages.nodeID, node.nodeLabel, outages.ipaddr, ipinterface.iphostname, service.servicename, outages.serviceId " +
                     "from outages, node, ipinterface, service " +
                     "where outages.nodeid=? and node.nodeid=outages.nodeid and outages.serviceid=service.serviceid and ipinterface.ipaddr=outages.ipaddr o" +
                     "rder by iflostservice desc");
@@ -238,7 +238,7 @@
 
         try {
             PreparedStatement stmt = conn.prepareStatement(
-                    "SELECT DISTINCT outages.iflostservice, outages.ifregainedservice, outages.nodeID, node.nodeLabel, outages.ipaddr, ipinterface.iphostname, service.servicename, outages.serviceId " +
+                    "SELECT DISTINCT outages.outageid, outages.iflostservice, outages.ifregainedservice, outages.nodeID, node.nodeLabel, outages.ipaddr, ipinterface.iphostname, service.servicename, outages.serviceId " +
                     "from outages, node, ipinterface, service " +
                     "where outages.nodeid=? and node.nodeid=outages.nodeid " +
                     "and outages.serviceid=service.serviceid and ipinterface.ipaddr=outages.ipaddr " +
@@ -266,7 +266,7 @@
 
         try {
             PreparedStatement stmt = conn.prepareStatement(
-                    "SELECT DISTINCT outages.iflostservice, outages.ifregainedservice, outages.nodeID, node.nodeLabel, outages.ipaddr, ipinterface.iphostname, service.servicename, outages.serviceId " +
+                    "SELECT DISTINCT outages.outageid, outages.iflostservice, outages.ifregainedservice, outages.nodeID, node.nodeLabel, outages.ipaddr, ipinterface.iphostname, service.servicename, outages.serviceId " +
                     "from outages, node, ipinterface, service " +
                     "where outages.nodeid=? and outages.ipaddr=? " +
                     "and node.nodeid=outages.nodeid and outages.serviceid=service.serviceid and ipinterface.ipaddr=outages.ipaddr " +
@@ -308,7 +308,7 @@
 
         try {
             PreparedStatement stmt = conn.prepareStatement(
-                    "SELECT DISTINCT outages.iflostservice, outages.ifregainedservice, outages.nodeID, node.nodeLabel, outages.ipaddr, ipinterface.iphostname, service.servicename, outages.serviceId " +
+                    "SELECT DISTINCT outages.outageid, outages.iflostservice, outages.ifregainedservice, outages.nodeID, node.nodeLabel, outages.ipaddr, ipinterface.iphostname, service.servicename, outages.serviceId " +
                     "from outages, node, ipinterface, service " +
                     "where outages.nodeid=? and outages.ipaddr=? " +
                     "and node.nodeid=outages.nodeid and outages.serviceid=service.serviceid and ipinterface.ipaddr=outages.ipaddr " +
@@ -339,7 +339,7 @@
 
         try {
             PreparedStatement stmt = conn.prepareStatement(
-                    "SELECT DISTINCT outages.iflostservice, outages.ifregainedservice, outages.nodeID, node.nodeLabel, outages.ipaddr, ipinterface.iphostname, service.servicename, outages.serviceId " +
+                    "SELECT DISTINCT outages.outageid, outages.iflostservice, outages.ifregainedservice, outages.nodeID, node.nodeLabel, outages.ipaddr, ipinterface.iphostname, service.servicename, outages.serviceId " +
                     "from outages, node, ipinterface, service " +
                     "where outages.nodeid=? and outages.ipaddr=? and outages.serviceid=? " +
                     "and node.nodeid=outages.nodeid and outages.serviceid=service.serviceid and ipinterface.ipaddr=outages.ipaddr " +
@@ -383,7 +383,7 @@
 
         try {
             PreparedStatement stmt = conn.prepareStatement(
-                    "SELECT DISTINCT outages.iflostservice, outages.ifregainedservice, outages.nodeID, node.nodeLabel, outages.ipaddr, ipinterface.iphostname, service.servicename, outages.serviceId " +
+                    "SELECT DISTINCT outages.outageid, outages.iflostservice, outages.ifregainedservice, outages.nodeID, node.nodeLabel, outages.ipaddr, ipinterface.iphostname, service.servicename, outages.serviceId " +
                     "from outages, node, ipinterface, service " +
                     "where outages.nodeid=? " +
                     "and outages.ipaddr=? and outages.serviceid=? " +
@@ -545,6 +545,11 @@
             element = rs.getString("servicename");
             outage.serviceName = (String)element;
 
+            element = new Integer(rs.getInt("outageid"));
+            if( element != null) {
+            	outage.outageId = ((Integer)element).intValue();
+            }
+            
             element = rs.getTimestamp("iflostservice");
             if( element != null) {
                 outage.lostServiceTime = new Date(((Timestamp)element).getTime());                
Index: src/web/web/outage/current.jsp
===================================================================
RCS file: /cvsroot/opennms/opennms/src/web/web/outage/current.jsp,v
retrieving revision 1.7
diff -u -r1.7 current.jsp
--- src/web/web/outage/current.jsp	7 Oct 2004 20:23:51 -0000	1.7
+++ src/web/web/outage/current.jsp	20 Oct 2004 12:23:54 -0000
@@ -142,7 +142,8 @@
             <td><b>Node</b></td>
             <td WIDTH="15%"><b>Interface</b></td>
             <td width="10%"><b>Service&nbsp;Down</b></td>
-            <td WIDTH="40%"><b>Time&nbsp;Down</b></td>
+            <td WIDTH="30%"><b>Time&nbsp;Down</b></td>
+            <td WIDTH="10%"><b>Outage&nbsp;ID</b></td>
           </tr>
 
           <% for( int nodeIndex=0; nodeIndex < nodeList.size(); nodeIndex++ ) { %>
@@ -159,6 +160,7 @@
                     Outage outage = (Outage)svcList.get(svcIndex);
                     int nodeId = outage.getNodeId();
                     String ipAddr = outage.getIpAddress();
+		    int outageId = outage.getId();
                 %>                 
 
                 <tr valign="top" <% if( nodeIndex%2 == 0 ) out.print( "BGCOLOR=\"#cccccc\""); %>>
@@ -172,13 +174,14 @@
                     
                   <td><a HREF="element/service.jsp?node=<%=nodeId%>&intf=<%=ipAddr%>&service=<%=outage.getServiceId()%>"><%=outage.getServiceName()%></a></td>
                   <td><%=org.opennms.netmgt.EventConstants.formatToUIString(outage.getTimeDown())%></td>
+                  <td><a href="outage/detail.jsp?id=<%=outageId%>"><%=outageId%></a></td>
                 </tr>
               <% } /* endfor service */ %>
             <% } /*endfor interface */ %>
           <% } /*endfor node */ %>
         
           <tr valign="top" BGCOLOR="#999999">
-            <td colspan="4"> 
+            <td colspan="5"> 
               <b><%=outages.length%> total services down on <%=interfaceCount%> interfaces of <%=nodeCount%> nodes</b>
             </td>
           </tr>