unicorn commit: added link to direct validation in case of 500 error code from observer

changeset:   1286:31dc84cc1a06
tag:         tip
user:        Thomas Gambet <tgambet@w3.org>
date:        Mon Jun 21 15:19:33 2010 -0400
files:       WebContent/WEB-INF/languages/de.properties WebContent/WEB-INF/languages/en.properties WebContent/WEB-INF/languages/es.properties WebContent/WEB-INF/languages/fr.properties WebContent/WEB-INF/languages/hu.properties WebContent/WEB-INF/languages/id.properties WebContent/WEB-INF/languages/it.properties WebContent/WEB-INF/languages/ja.properties WebContent/WEB-INF/languages/ko.properties WebContent/WEB-INF/languages/nb.properties WebContent/WEB-INF/languages/nl.properties WebContent/WEB-INF/languages/pl.properties WebContent/WEB-INF/languages/ru.properties WebContent/WEB-INF/languages/sv.properties WebContent/WEB-INF/languages/te.properties WebContent/WEB-INF/languages/th.properties src/org/w3c/unicorn/request/URIRequest.java src/org/w3c/unicorn/request/UploadRequest.java
description:
added link to direct validation in case of 500 error code from observer


diff -r eb5fdf3b81f2 -r 31dc84cc1a06 WebContent/WEB-INF/languages/de.properties
--- a/WebContent/WEB-INF/languages/de.properties	Mon Jun 21 13:40:42 2010 -0400
+++ b/WebContent/WEB-INF/languages/de.properties	Mon Jun 21 15:19:33 2010 -0400
@@ -51,7 +51,7 @@
 message_not_found_mime_type=Der MIME-Type deines Dokuments konnte nicht herausgefunden werden.
 message_nothing_to_validate=Es wurde kein Dokument übermittelt.
 message_observer_connect_exception="%1" ist nicht erreichbar.
-message_observer_internal_error="%1" hat einen internen Fehler gemeldet.
+message_observer_internal_error="%1" hat einen internen Fehler gemeldet. <a href="%2">${direct_link_label}</a>.
 message_observer_not_found=Die Anfrage nach "%1" endete in einem <a href\="http\://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html\#sec10.4.5">404 (Not Found) HTTP Fehler</a>.
 message_observer_read_timeout="%1" hat nicht rechtzeitig geantwortet.
 message_response_invalid_schema="%1" benutzt ein nicht unterstütztes Format für die Antwort.
diff -r eb5fdf3b81f2 -r 31dc84cc1a06 WebContent/WEB-INF/languages/en.properties
--- a/WebContent/WEB-INF/languages/en.properties	Mon Jun 21 13:40:42 2010 -0400
+++ b/WebContent/WEB-INF/languages/en.properties	Mon Jun 21 15:19:33 2010 -0400
@@ -52,7 +52,7 @@
 message_nothing_to_validate=No document has been submitted.
 message_no_uploaded_file=You must upload a file.
 message_observer_connect_exception="%1" is unreachable.
-message_observer_internal_error="%1" reported an internal error.
+message_observer_internal_error="%1" reported an internal error. <a href="%2">${direct_link_label}</a>.
 message_observer_not_found=The request to "%1" resulted in a <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4.5">404 (Not Found) HTTP error</a>.
 message_observer_read_timeout="%1" didn't return a response in time.
 message_response_invalid_schema="%1" used an unsupported response format.
diff -r eb5fdf3b81f2 -r 31dc84cc1a06 WebContent/WEB-INF/languages/es.properties
--- a/WebContent/WEB-INF/languages/es.properties	Mon Jun 21 13:40:42 2010 -0400
+++ b/WebContent/WEB-INF/languages/es.properties	Mon Jun 21 15:19:33 2010 -0400
@@ -51,7 +51,7 @@
 message_not_found_mime_type=El tipo MIME de su documento no ha podido ser identificado.
 message_nothing_to_validate=No se ha enviado ningún documento.
 message_observer_connect_exception=No se ha podido acceder al validador "%1".
-message_observer_internal_error=El validador "%1" informó de un error interno.
+message_observer_internal_error=El validador "%1" informó de un error interno. <a href="%2">${direct_link_label}</a>.
 message_observer_not_found=La petición "%1" para el validador resultó en un <a href\="http\://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html\#sec10.4.5">error HTTPb404 (No encontrado)</a>.
 message_observer_read_timeout=Unicorn no recibió a tiempo una respuesta desde "%1"
 message_response_invalid_schema=Unicorn y "%1" no hablan el mismo idioma
diff -r eb5fdf3b81f2 -r 31dc84cc1a06 WebContent/WEB-INF/languages/fr.properties
--- a/WebContent/WEB-INF/languages/fr.properties	Mon Jun 21 13:40:42 2010 -0400
+++ b/WebContent/WEB-INF/languages/fr.properties	Mon Jun 21 15:19:33 2010 -0400
@@ -52,8 +52,8 @@
 message_not_found_mime_type=Le mime-type de votre document n'a pas été trouvé.
 message_nothing_to_validate=Aucun document n'a été soumis.
 message_observer_connect_exception="%1" est injoignable.
-message_observer_internal_error="%1" a rapporté une erreur interne.
-message_observer_not_found=La requête à "%1" a renvoyé une <a href\="http\://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html\#sec10.4.5">erreur HTTP 404 (Not Found)</a>.
+message_observer_internal_error="%1" a rapporté une erreur interne. <a href="%2">${direct_link_label}</a>.
+message_observer_not_found=La requête à "%1" a renvoyé une <a href\="http\://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html\#sec10.4.5">erreur HTTP 404 (Not Found)</a>. <a href="%2">${direct_link_label}</a>.
 message_observer_read_timeout=Unicorn n'a pas obtenu de réponse de "%1" à temps.
 message_response_invalid_schema="%1" utilise un format de réponse non conforme à Unicorn.
 message_response_validation_error="%1" a retourné une réponse invalide.
diff -r eb5fdf3b81f2 -r 31dc84cc1a06 WebContent/WEB-INF/languages/hu.properties
--- a/WebContent/WEB-INF/languages/hu.properties	Mon Jun 21 13:40:42 2010 -0400
+++ b/WebContent/WEB-INF/languages/hu.properties	Mon Jun 21 15:19:33 2010 -0400
@@ -51,7 +51,7 @@
 message_not_found_mime_type=Nem sikerült a dokumentum MIME típusát meghatározni\!
 message_nothing_to_validate=Nem lett elküldve dokumentum\!
 message_observer_connect_exception="%1" elérhetetlen\!
-message_observer_internal_error="%1" belső hibát jelzett\!
+message_observer_internal_error="%1" belső hibát jelzett\! <a href="%2">${direct_link_label}</a>.
 message_observer_not_found=A kérés "%1" címhez <a href\="http\://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html\#sec10.4.5">404 (Nem található) HTTP hibát</a> eredményezett.
 message_observer_read_timeout="%1" nem reagált a válaszidőn belül\!
 message_response_invalid_schema="%1" válaszának formátuma nem támogatott\!
diff -r eb5fdf3b81f2 -r 31dc84cc1a06 WebContent/WEB-INF/languages/id.properties
--- a/WebContent/WEB-INF/languages/id.properties	Mon Jun 21 13:40:42 2010 -0400
+++ b/WebContent/WEB-INF/languages/id.properties	Mon Jun 21 15:19:33 2010 -0400
@@ -51,7 +51,7 @@
 message_not_found_mime_type=Mime-type dokumen anda tidak bisa dideteksi.
 message_nothing_to_validate=Tidak ada dokumen yang dikirim.
 message_observer_connect_exception="%1" tidak tercapai.
-message_observer_internal_error="%1" mengalami galat internal.
+message_observer_internal_error="%1" mengalami galat internal. <a href="%2">${direct_link_label}</a>.
 message_observer_not_found=Permintaan "%1" menghasilkan <a href\="http\://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html\#sec10.4.5">Galat HTTP 404 (Tidak Ditemukan)</a>.
 message_observer_read_timeout="%1" tidak ada respon.
 message_response_invalid_schema="%1" memakai format yang tidak didukung.
diff -r eb5fdf3b81f2 -r 31dc84cc1a06 WebContent/WEB-INF/languages/it.properties
--- a/WebContent/WEB-INF/languages/it.properties	Mon Jun 21 13:40:42 2010 -0400
+++ b/WebContent/WEB-INF/languages/it.properties	Mon Jun 21 15:19:33 2010 -0400
@@ -51,7 +51,7 @@
 message_not_found_mime_type=Non è stato possibile capire il mime-type del tuo documento.
 message_nothing_to_validate=Nessun documento è stato inviato.
 message_observer_connect_exception=L' osservatore "%1" non è raggiungibile.
-message_observer_internal_error=L' osservatore "%1" ha riportato un errore interno.
+message_observer_internal_error=L' osservatore "%1" ha riportato un errore interno. <a href="%2">${direct_link_label}</a>.
 message_observer_not_found=La richiesta all' osservatore "%1" è terminata con un <a href\="http\://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html\#sec10.4.5">404 (Non Trovato) errore HTTP</a>.
 message_observer_read_timeout="%1" non ha inviato una risposta in tempo.
 message_response_invalid_schema="%1" ha utilizzato un formato di risposta non supportato.
diff -r eb5fdf3b81f2 -r 31dc84cc1a06 WebContent/WEB-INF/languages/ja.properties
--- a/WebContent/WEB-INF/languages/ja.properties	Mon Jun 21 13:40:42 2010 -0400
+++ b/WebContent/WEB-INF/languages/ja.properties	Mon Jun 21 15:19:33 2010 -0400
@@ -48,7 +48,7 @@
 message_not_found_mime_type=文書のmime-typeを推測することができませんでした。
 message_nothing_to_validate=文書が送信されていません。
 message_observer_connect_exception=「%1」は到達不可能です。
-message_observer_internal_error=「%1」が内部エラーを報告しました。
+message_observer_internal_error=「%1」が内部エラーを報告しました。 <a href="%2">${direct_link_label}</a>。
 message_observer_not_found=「%1」に対する要求の結果は<a href\="http\://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html\#sec10.4.5">404 (Not Found) HTTPエラー</a>になりました。
 message_observer_read_timeout=「%1」が時間内に応答しませんでした。
 message_response_invalid_schema=「%1」は対応していない形式の応答を利用しています。
diff -r eb5fdf3b81f2 -r 31dc84cc1a06 WebContent/WEB-INF/languages/ko.properties
--- a/WebContent/WEB-INF/languages/ko.properties	Mon Jun 21 13:40:42 2010 -0400
+++ b/WebContent/WEB-INF/languages/ko.properties	Mon Jun 21 15:19:33 2010 -0400
@@ -51,7 +51,7 @@
 message_nothing_to_validate=제출한 문서가 없습니다.
 message_no_uploaded_file=파일을 반드시 업로드해야 합니다.
 message_observer_connect_exception="%1" is unreachable.
-message_observer_internal_error="%1"이 내부 에러가 발생했습니다.
+message_observer_internal_error="%1"이 내부 에러가 발생했습니다. <a href="%2">${direct_link_label}</a>.
 message_observer_not_found="%1"에 대한 요청은 <a href\="http\://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html\#sec10.4.5">404 HTTP 에러</a>를 발생했습니다.
 message_observer_read_timeout=현재 "%1"이 응답하지 않습니다.
 message_response_invalid_schema="%1"이 지원하지 않는 형식으로 응답합니다.
diff -r eb5fdf3b81f2 -r 31dc84cc1a06 WebContent/WEB-INF/languages/nb.properties
--- a/WebContent/WEB-INF/languages/nb.properties	Mon Jun 21 13:40:42 2010 -0400
+++ b/WebContent/WEB-INF/languages/nb.properties	Mon Jun 21 15:19:33 2010 -0400
@@ -51,7 +51,7 @@
 message_not_found_mime_type=Dokumentets mime-type lot seg ikke utlede.
 message_nothing_to_validate=Ingen dokument ble lagt inn.
 message_observer_connect_exception="%1" lot seg ikke kontakte.
-message_observer_internal_error="%1" rapporterte en intern feil.
+message_observer_internal_error="%1" rapporterte en intern feil. <a href="%2">${direct_link_label}</a>.
 message_observer_not_found=Henvendelsen til "%1" resulterte i en feil\: <a href\="http\://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html\#sec10.4.5">404 (Not Found) HTTP error</a>.
 message_observer_read_timeout="%1" ga ikke svar i tide.
 message_response_invalid_schema="%1" brukte et responsformat det ikke er støtte for.
diff -r eb5fdf3b81f2 -r 31dc84cc1a06 WebContent/WEB-INF/languages/nl.properties
--- a/WebContent/WEB-INF/languages/nl.properties	Mon Jun 21 13:40:42 2010 -0400
+++ b/WebContent/WEB-INF/languages/nl.properties	Mon Jun 21 15:19:33 2010 -0400
@@ -51,7 +51,7 @@
 message_not_found_mime_type=Het MIME-type van uw document kon niet worden bepaald.
 message_nothing_to_validate=Er is geen document opgegeven.
 message_observer_connect_exception=De Observer "%1" is onbereikbaar.
-message_observer_internal_error=De Observer "%1" rapporteerde een interne fout.
+message_observer_internal_error=De Observer "%1" rapporteerde een interne fout. <a href="%2">${direct_link_label}</a>.
 message_observer_not_found=Het verzoek aan de Observer "%1" resulteerde in een <a href\="http\://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html\#sec10.4.5">HTTP-foutmelding 404 (“niet gevonden”)</a>.
 message_observer_read_timeout="%1" gaf niet op tijd antwoord.
 message_response_invalid_schema="%1" gebruikt een niet-ondersteund antwoordformaat.
diff -r eb5fdf3b81f2 -r 31dc84cc1a06 WebContent/WEB-INF/languages/pl.properties
--- a/WebContent/WEB-INF/languages/pl.properties	Mon Jun 21 13:40:42 2010 -0400
+++ b/WebContent/WEB-INF/languages/pl.properties	Mon Jun 21 15:19:33 2010 -0400
@@ -51,7 +51,7 @@
 message_not_found_mime_type=Próba odgadnięcia typu mime dokumentu nie powiodła się.
 message_nothing_to_validate=Nie przekazano żadnego dokumentu.
 message_observer_connect_exception="%1" jest nieosiągalny.
-message_observer_internal_error="%1" zwrócił błąd wewnętrzny.
+message_observer_internal_error="%1" zwrócił błąd wewnętrzny. <a href="%2">${direct_link_label}</a>.
 message_observer_not_found=Zapytanie do "%1" zwróciło <a href\="http\://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html\#sec10.4.5">bład 404 (nie znaleziono)</a>.
 message_observer_read_timeout="%1" nie odpowiedział przed upływem wyznaczonego czasu.
 message_response_invalid_schema="%1" zwrócił odpowiedź w nieobsługiwanym formacie.
diff -r eb5fdf3b81f2 -r 31dc84cc1a06 WebContent/WEB-INF/languages/ru.properties
--- a/WebContent/WEB-INF/languages/ru.properties	Mon Jun 21 13:40:42 2010 -0400
+++ b/WebContent/WEB-INF/languages/ru.properties	Mon Jun 21 15:19:33 2010 -0400
@@ -51,7 +51,7 @@
 message_not_found_mime_type=Не получилось определить mime-тип вашего документа.
 message_nothing_to_validate=Документ не был отправлен.
 message_observer_connect_exception=«%1» недоступен.
-message_observer_internal_error=«%1» сообщил о внутренней ошибке.
+message_observer_internal_error=«%1» сообщил о внутренней ошибке. <a href="%2">${direct_link_label}</a>.
 message_observer_not_found=Запрос к «%1» вернул <a href\="http\://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html\#sec10.4.5">HTTP-ошибку 404 (Not Found)</a>.
 message_observer_read_timeout=«%1» не вернул ответ вовремя.
 message_response_invalid_schema=«%1» использует неподдерживаемый формат ответа.
diff -r eb5fdf3b81f2 -r 31dc84cc1a06 WebContent/WEB-INF/languages/sv.properties
--- a/WebContent/WEB-INF/languages/sv.properties	Mon Jun 21 13:40:42 2010 -0400
+++ b/WebContent/WEB-INF/languages/sv.properties	Mon Jun 21 15:19:33 2010 -0400
@@ -51,7 +51,7 @@
 message_not_found_mime_type=Ditt dokuments MIME-typ kunde inte fastställas.
 message_nothing_to_validate=Inget dokument har skickats.
 message_observer_connect_exception="%1" går inte att nå.
-message_observer_internal_error="%1" rapporterade ett internet fel.
+message_observer_internal_error="%1" rapporterade ett internet fel. <a href="%2">${direct_link_label}</a>.
 message_observer_not_found=Hämtningen av "%1" resulterade i ett <a href\="http\://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html\#sec10.4.5">404 (Hittades ej) HTTP fel</a>.
 message_observer_read_timeout="%1" svarade inte i tid.
 message_response_invalid_schema="%1" svarade med ett format som inte stödjs.
diff -r eb5fdf3b81f2 -r 31dc84cc1a06 WebContent/WEB-INF/languages/te.properties
--- a/WebContent/WEB-INF/languages/te.properties	Mon Jun 21 13:40:42 2010 -0400
+++ b/WebContent/WEB-INF/languages/te.properties	Mon Jun 21 15:19:33 2010 -0400
@@ -25,7 +25,7 @@
 message_no_observation_done=చూపించడానికి ఫలితం లేదు.
 message_no_uploaded_file=మీరు తప్పనిసరిగా దస్త్రాన్ని ఎక్కించాలి.
 message_observer_connect_exception="%1" అందుబాటులో లేదు.
-message_observer_internal_error="%1" అంతర్గత పొరపాటుని నివేదించింది.
+message_observer_internal_error="%1" అంతర్గత పొరపాటుని నివేదించింది. <a href="%2">${direct_link_label}</a>.
 message_translation=మీ మాతృభాష లోనికి <a href\="./translations%2">యూనికార్న్‌ని అనువదించడానికి</a> మాకు సహాయపడండి.
 message_unavailable_language=మీ ప్రాథాన్య భాష (%1) లో యూనికార్న్ అందుబాటులో లేదు. ${message_translation}
 message_unavailable_requested_language=మీరు అభ్యర్థించిన బాష (%1) లో యూనికార్న్ అందుబాటులో లేదు. ${message_translation}
diff -r eb5fdf3b81f2 -r 31dc84cc1a06 WebContent/WEB-INF/languages/th.properties
--- a/WebContent/WEB-INF/languages/th.properties	Mon Jun 21 13:40:42 2010 -0400
+++ b/WebContent/WEB-INF/languages/th.properties	Mon Jun 21 15:19:33 2010 -0400
@@ -52,7 +52,7 @@
 message_not_found_mime_type=mime-type ของเอกสารท่านไม่สามารถระบุได้
 message_nothing_to_validate=ยังไม่ได้ทำการส่งเอกสารเพื่อตรวจสอบ
 message_observer_connect_exception="%1" ไม่สามารถเชื่อมต่อได้
-message_observer_internal_error="%1" พบความผิดพลาดภายใน
+message_observer_internal_error="%1" พบความผิดพลาดภายใน. <a href="%2">${direct_link_label}</a>.
 message_observer_not_found=คำร้องขอต่อเอกสาร "%1" <a href\="http\://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html\#sec10.4.5">เกิดข้อผิดพลาด HTTP 404 (ไม่พบหน้าที่ต้องการ) </a>.
 message_observer_read_timeout="%1" ไม่ตอบสนองภายในเวลาที่เหมาะสม
 message_response_invalid_schema="%1" ใช้รูปแบบการตอบสนองที่ไม่รองรับ
diff -r eb5fdf3b81f2 -r 31dc84cc1a06 src/org/w3c/unicorn/request/URIRequest.java
--- a/src/org/w3c/unicorn/request/URIRequest.java	Mon Jun 21 13:40:42 2010 -0400
+++ b/src/org/w3c/unicorn/request/URIRequest.java	Mon Jun 21 15:19:33 2010 -0400
@@ -131,9 +131,11 @@
 			int responseCode = aURLConnection.getResponseCode();
 			switch (responseCode) {
 			case HttpURLConnection.HTTP_NOT_FOUND:
-				throw new UnicornException(Message.ERROR, "$message_observer_not_found", null, observerName);
+				throw new UnicornException(Message.ERROR, "$message_observer_not_found", null, observerName, 
+						aURL.toString().replaceAll("&?" + Framework.mapOfObserver.get(observerId).getParamOutputName() + "=[^&]*", ""));
 			case HttpURLConnection.HTTP_INTERNAL_ERROR:
-				throw new UnicornException(Message.ERROR, "$message_observer_internal_error", null, observerName);
+				throw new UnicornException(Message.ERROR, "$message_observer_internal_error", null, observerName,
+						aURL.toString().replaceAll("&?" + Framework.mapOfObserver.get(observerId).getParamOutputName() + "=[^&]*", ""));
 			}
 			
 			return ResponseFactory.getResponse(aURLConnection.getInputStream(), responseType, aURL.toString(), aURLConnection.getContentEncoding(), observerId);
diff -r eb5fdf3b81f2 -r 31dc84cc1a06 src/org/w3c/unicorn/request/UploadRequest.java
--- a/src/org/w3c/unicorn/request/UploadRequest.java	Mon Jun 21 13:40:42 2010 -0400
+++ b/src/org/w3c/unicorn/request/UploadRequest.java	Mon Jun 21 15:19:33 2010 -0400
@@ -117,10 +117,10 @@
 				// TODO How to find the response content encoding here ?
 				return ResponseFactory.getResponse(stream, responseType, sURL.toString(), null, observerId);
 			} catch (FileNotFoundException e) {
-				throw new UnicornException(Message.ERROR, "$message_observer_not_found", null, observerName);
+				throw new UnicornException(Message.ERROR, "$message_observer_not_found", null, observerName, Framework.mapOfObserver.get(observerId).getIndexURI());
 			} catch (IOException e) {
 				if (e.getMessage().contains("Server returned HTTP response code: 500"))
-					throw new UnicornException(Message.ERROR, "$message_observer_internal_error", null, observerName);
+					throw new UnicornException(Message.ERROR, "$message_observer_internal_error", null, observerName, Framework.mapOfObserver.get(observerId).getIndexURI());
 				else
 					throw e;
 			}			

Received on Monday, 21 June 2010 19:19:47 UTC