flyson
flyso****@users*****
2006年 12月 11日 (月) 01:12:13 JST
Index: bbs2chreader/content/bbs2chreader/board-items.js
diff -u bbs2chreader/content/bbs2chreader/board-items.js:1.16 bbs2chreader/content/bbs2chreader/board-items.js:1.16.2.1
--- bbs2chreader/content/bbs2chreader/board-items.js:1.16 Wed Oct 25 01:34:09 2006
+++ bbs2chreader/content/bbs2chreader/board-items.js Mon Dec 11 01:12:13 2006
@@ -191,26 +191,38 @@
// s‚̉ðÍ‚ÉŽg‚¤³‹K•\Œ»
var regLine;
- if(this.type==this._bbs2chService.BOARD_TYPE_2CH ||
- this.type==this._bbs2chService.BOARD_TYPE_BE2CH){ // 2ch
- regLine = /^(\d{9,10})\.dat<>(.+) ?\((\d{1,4})\)/;
- }else if(this.type==this._bbs2chService.BOARD_TYPE_JBBS){ // JBBS
- regLine = /^(\d{9,10})\.cgi,(.+) ?\((\d{1,4})\)/;
+ switch(this.type){
+ case this._bbs2chService.BOARD_TYPE_2CH:
+ case this._bbs2chService.BOARD_TYPE_BE2CH:
+ regLine = /^(\d{9,10})\.dat<>(.+) ?\((\d{1,4})\)/;
+ break;
+ case this._bbs2chService.BOARD_TYPE_JBBS:
+ case this._bbs2chService.BOARD_TYPE_MACHI:
+ regLine = /^(\d{9,10})\.cgi,(.+) ?\((\d{1,4})\)/;
+ break;
}
// ƒXƒŒƒbƒh‚Ì URL
var baseUrlSpec;
var categoryPath;
var threadUrlSpec;
- if(this.type == this._bbs2chService.BOARD_TYPE_2CH ||
- this.type == this._bbs2chService.BOARD_TYPE_BE2CH){ // 2ch
- baseUrlSpec = this.url.resolve("../");
- categoryPath = this.url.spec.substring(baseUrlSpec.length);
- threadUrlSpec = baseUrlSpec + "test/read.cgi/" + categoryPath;
- }else if(this.type == this._bbs2chService.BOARD_TYPE_JBBS){ // JBBS
- baseUrlSpec = this.url.resolve("../../");
- categoryPath = this.url.spec.substring(baseUrlSpec.length);
- threadUrlSpec = baseUrlSpec + "bbs/read.cgi/" + categoryPath;
+ switch(this.type){
+ case this._bbs2chService.BOARD_TYPE_2CH:
+ case this._bbs2chService.BOARD_TYPE_BE2CH:
+ baseUrlSpec = this.url.resolve("../");
+ categoryPath = this.url.spec.substring(baseUrlSpec.length);
+ threadUrlSpec = baseUrlSpec + "test/read.cgi/" + categoryPath;
+ break;
+ case this._bbs2chService.BOARD_TYPE_JBBS:
+ baseUrlSpec = this.url.resolve("../../");
+ categoryPath = this.url.spec.substring(baseUrlSpec.length);
+ threadUrlSpec = baseUrlSpec + "bbs/read.cgi/" + categoryPath;
+ break;
+ case this._bbs2chService.BOARD_TYPE_MACHI:
+ categoryPath = this.url.directory.replace(/\//g, "");
+ baseUrlSpec = this.url.resolve("../");
+ threadUrlSpec = baseUrlSpec + "bbs/read.cgi?BBS=" + categoryPath;
+ break;
}
if(aFilterLimit == -1 ) aFilterLimit = subjectLines.length;
@@ -235,6 +247,9 @@
item.force = this.getThreadForce(item.datID, item.count);
item.makeDate = item.datID * 1000;
item.url = threadUrlSpec + item.datID + "/";
+ if(this.type == this._bbs2chService.BOARD_TYPE_MACHI){
+ item.url = threadUrlSpec + "&KEY=" + item.datID;
+ }
if(logItemHash.hasOwnProperty("item-" + item.datID)){
var logItem = logItemHash["item-" + item.datID];
@@ -311,6 +326,9 @@
logItem.force = 0;
logItem.makeDate = logItem.datID * 1000;
logItem.url = aThreadUrlSpec + logItem.datID + "/";
+ if(this.type == this._bbs2chService.BOARD_TYPE_MACHI){
+ logItem.url = aThreadUrlSpec + "&KEY=" + logItem.datID;
+ }
if(logItem.id in cacheItemHash &&
cacheItemHash[logItem.id].lastModified == lastModified){
Index: bbs2chreader/content/bbs2chreader/board-page.js
diff -u bbs2chreader/content/bbs2chreader/board-page.js:1.35.2.1 bbs2chreader/content/bbs2chreader/board-page.js:1.35.2.2
--- bbs2chreader/content/bbs2chreader/board-page.js:1.35.2.1 Sat Nov 11 01:21:39 2006
+++ bbs2chreader/content/bbs2chreader/board-page.js Mon Dec 11 01:12:13 2006
@@ -284,11 +284,16 @@
if(index == -1) return;
// スレッド表示数の制限
- var threadViewLimit = Number(gBbs2chService.pref.getIntPref("fls.bbs2chreader.board_thread_view_limit"));
+ var threadViewLimit = Number(gBbs2chService.pref.getIntPref(
+ "fls.bbs2chreader.board_thread_view_limit"));
if(isNaN(threadViewLimit) || threadViewLimit == 0){
threadViewLimit = "";
}else{
- threadViewLimit = "l" + threadViewLimit;
+ if(gBoardItems.type == gBbs2chService.BOARD_TYPE_MACHI){
+ threadViewLimit = "&LAST=" + threadViewLimit;
+ }else{
+ threadViewLimit = "l" + threadViewLimit;
+ }
}
var port = gBbs2chService.pref.getIntPref("fls.bbs2chreader.server_port");