diff -c jbidwatcher-1.0.1/AuctionServer.java jbidwatcher-1.0.1.1/AuctionServer.java *** jbidwatcher-1.0.1/AuctionServer.java 2007-04-28 22:37:23.000000000 +0200 --- jbidwatcher-1.0.1.1/AuctionServer.java 2007-07-19 16:15:45.000000000 +0200 *************** *** 652,657 **** --- 652,658 ---- if(successfulParse) { successfulParse = curAuction.preParseAuction(); if(successfulParse) { + ErrorManagement.logDebug("XXX: Done preParse, now the real thing..."); successfulParse = curAuction.parseAuction(ae); } else { ErrorManagement.logMessage("Bad Parse!"); *************** *** 744,749 **** --- 745,753 ---- String endTimeFmt = endTime; SimpleDateFormat sdf = new SimpleDateFormat(siteDateFormat, Locale.US); + ErrorManagement.logDebug("XXX07: we try to figureDate() for:"); + ErrorManagement.logDebug(endTime); + sdf.set2DigitYearStart(midpointDate.getTime()); if(endTime == null) return null; *************** *** 760,765 **** --- 764,778 ---- ErrorManagement.handleException("Error parsing date (" + endTimeFmt + "), setting to completed.", e); endingDate = new Date(); } + + if(endingDate == null) { + ErrorManagement.logDebug("XXX06: OOPS, returning 'null' from figureDate!"); + } else { + ErrorManagement.logDebug("XXX06: ok, returning some date from figureDate."); + } + + + return(endingDate); } Only in jbidwatcher-1.0.1.1: AuctionServer.java~ Common subdirectories: jbidwatcher-1.0.1/audio and jbidwatcher-1.0.1.1/audio Only in jbidwatcher-1.0.1.1: classes Common subdirectories: jbidwatcher-1.0.1/com and jbidwatcher-1.0.1.1/com Only in jbidwatcher-1.0.1: display.cfg diff -c jbidwatcher-1.0.1/ebayServer.java jbidwatcher-1.0.1.1/ebayServer.java *** jbidwatcher-1.0.1/ebayServer.java 2007-04-28 22:37:24.000000000 +0200 --- jbidwatcher-1.0.1.1/ebayServer.java 2007-07-19 16:16:42.000000000 +0200 *************** *** 1927,1933 **** if(auctionTitle.startsWith(eBayTitles[i])) return true; } ! return false; } private Currency getUSCurrency(Currency val, JHTML _htmlDoc) { --- 1927,1937 ---- if(auctionTitle.startsWith(eBayTitles[i])) return true; } ! //XXX HACK! on 20070719 ebay stopped to say anything about "eBay" in the title of auctions ! // additionaly, no information about end-of-auction in the title ! return true; ! ! //return false; } private Currency getUSCurrency(Currency val, JHTML _htmlDoc) { *************** *** 2185,2196 **** --- 2189,2203 ---- return false; } + ErrorManagement.logDebug("XXX: Is this a valid eBay item page?"); + // Is this a valid eBay item page? if(!checkTitle(prelimTitle)) { handle_bad_title(prelimTitle); finish(); return false; } + ErrorManagement.logDebug("XXX: YES!"); // If we got a valid title, mark the link as up, because it worked... MQFactory.getConcrete("Swing").enqueue("LINK UP"); //$NON-NLS-1$ //$NON-NLS-2$ *************** *** 2213,2218 **** --- 2220,2227 ---- if(newTitleR.search(prelimTitle)) { _title = decodeLatin(newTitleR.stringMatched(2)); String endDate = newTitleR.stringMatched(4); + ErrorManagement.logDebug("XXX01: we think endDate is:"); + ErrorManagement.logDebug(endDate); _end = figureDate(endDate, eBayDateFormat); } } *************** *** 2263,2268 **** --- 2272,2279 ---- if(_end == null) { String endDate = getEndDate(prelimTitle); + ErrorManagement.logDebug("XXX02: we think endDate is:"); + ErrorManagement.logDebug(endDate); _end = figureDate(endDate, eBayDateFormat); } *************** *** 2310,2317 **** _minBid = Currency.getCurrency(_htmlDocument.getNextContentAfterContent(eBayFirstBid)); // Handle odd case... if(_end == null) { ! _end = figureDate(_htmlDocument.getNextContentAfterContent(Externalized.getString("ebayServer.endsPrequel")), eBayDateFormat); //$NON-NLS-1$ } Currency maxBid = Currency.getCurrency(_htmlDocument.getNextContentAfterContent(Externalized.getString("ebayServer.yourMaxBid"))); _end = (Date)ensureSafeValue(_end, ae!=null?ae.getEndDate() :null, null); --- 2321,2340 ---- _minBid = Currency.getCurrency(_htmlDocument.getNextContentAfterContent(eBayFirstBid)); // Handle odd case... if(_end == null) { ! ErrorManagement.logDebug("XXX03: _end is still 'null', trying to get endDate from HTML:"); ! String ttt = _htmlDocument.getContentBeforeContent("Shipping costs:"); ! ErrorManagement.logDebug(ttt); ! if( ttt.indexOf(":") > 0) { ! ttt = ttt.substring(1,ttt.length()-1); ! ErrorManagement.logDebug("XXX---->> we should use this one!"); ! ErrorManagement.logDebug(ttt); ! } else { ! ttt=_htmlDocument.getNextContentAfterRegex(Externalized.getString("ebayServer.endsPrequelRegex")); ! } ! _end = //figureDate(_htmlDocument.getNextContentAfterContent(Externalized.getString("ebayServer.endsPrequel")), eBayDateFormat); //$NON-NLS-1$ ! figureDate(ttt, eBayDateFormat); } + //ErrorManagement.logMessage(_end); Currency maxBid = Currency.getCurrency(_htmlDocument.getNextContentAfterContent(Externalized.getString("ebayServer.yourMaxBid"))); _end = (Date)ensureSafeValue(_end, ae!=null?ae.getEndDate() :null, null); *************** *** 2367,2372 **** --- 2390,2403 ---- } _seller = _seller.trim(); + if(_end == null) { + ErrorManagement.logDebug("XXX04: _end is still 'null', re-try to read HTML"); + _end = figureDate(_htmlDocument.getNextContentAfterContent(Externalized.getString("ebayServer.endsPrequel2")), eBayDateFormat); //$NON-NLS-1$ + } + if(_end == null) { + ErrorManagement.logDebug("XXX05: _end is still 'null', OOPS ahead!!!"); + } + if(_end.getTime() > System.currentTimeMillis()) { // Item is not ended yet. if(ae != null) { Only in jbidwatcher-1.0.1.1: ebayServer.java~ Common subdirectories: jbidwatcher-1.0.1/help and jbidwatcher-1.0.1.1/help Common subdirectories: jbidwatcher-1.0.1/icons and jbidwatcher-1.0.1.1/icons Common subdirectories: jbidwatcher-1.0.1/javazoom and jbidwatcher-1.0.1.1/javazoom Only in jbidwatcher-1.0.1.1: JBidWatcher-1.0.1.1.jar Only in jbidwatcher-1.0.1.1: JBidWatcher-1.0.1.jar diff -c jbidwatcher-1.0.1/jbidwatcher.properties jbidwatcher-1.0.1.1/jbidwatcher.properties *** jbidwatcher-1.0.1/jbidwatcher.properties 2007-03-27 18:47:56.000000000 +0200 --- jbidwatcher-1.0.1.1/jbidwatcher.properties 2007-07-19 14:05:47.000000000 +0200 *************** *** 121,127 **** ebayServer.fixedPrice=(fixed price) ebayServer.hasBeenPurchased=This item has been purchased. ebayServer.endedEarly=Auction ended early ! ebayServer.endsPrequel=ends ebayServer.sellerInfoPrequel=Seller information ebayServer.reserveNotMet1=(reserve not yet met) ebayServer.reserveNotMet2=Reserve not met --- 121,130 ---- ebayServer.fixedPrice=(fixed price) ebayServer.hasBeenPurchased=This item has been purchased. ebayServer.endedEarly=Auction ended early ! ebayServer.endsPrequelOLD=ends ! ebayServer.endsPrequel=End time ! ebayServer.endsPrequel2=End time ! ebayServer.endsPrequelRegex=End time.*?\((.*?)\) ebayServer.sellerInfoPrequel=Seller information ebayServer.reserveNotMet1=(reserve not yet met) ebayServer.reserveNotMet2=Reserve not met Only in jbidwatcher-1.0.1.1: jbidwatcher.properties~ diff -c jbidwatcher-1.0.1/Makefile jbidwatcher-1.0.1.1/Makefile *** jbidwatcher-1.0.1/Makefile 2007-03-22 19:27:48.000000000 +0100 --- jbidwatcher-1.0.1.1/Makefile 2007-07-19 16:19:18.000000000 +0200 *************** *** 23,29 **** # JAR = jar ! VER = 1.0.1 JAVAC = javac PRODUCT= JBidWatcher TARSRC = jbidwatcher-$(VER) --- 23,29 ---- # JAR = jar ! VER = 1.0.1.1 JAVAC = javac PRODUCT= JBidWatcher TARSRC = jbidwatcher-$(VER) Common subdirectories: jbidwatcher-1.0.1/META-INF and jbidwatcher-1.0.1.1/META-INF Common subdirectories: jbidwatcher-1.0.1/org and jbidwatcher-1.0.1.1/org Common subdirectories: jbidwatcher-1.0.1/platform and jbidwatcher-1.0.1.1/platform