From 25da7a3a9409b1389c847784b2735163c070a7a3 Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Thu, 7 Apr 2016 08:29:54 -0700 Subject: [PATCH] More redirects and some API tweaks --- README.md | 9 ++-- devices/pc/machine/5160/ega/256kb/machine.md | 2 + devices/pc/machine/5160/ega/640kb/machine.md | 2 + devices/pc/machine/5160/mda/README.md | 2 + .../machine/5170/ega/1152kb/rev1/machine.md | 2 + .../pc/machine/5170/ega/640kb/rev1/machine.md | 3 ++ devices/pc/machine/5170/ega/README.md | 2 + devices/pc/rom/5170/README.md | 1 + devices/pc/rom/compaq/README.md | 2 + devices/pc/rom/compaq/deskpro386/README.md | 1 + disks/pc/tools/microsoft/README.md | 17 ++++--- disks/pc/tools/microsoft/os2/sdk/README.md | 11 +++++ disks/pc/tools/microsoft/windows/README.md | 19 +++++++ .../pc/tools/microsoft/windows/sdk/README.md | 14 ++++++ disks/pc/windows/2.03/README.md | 2 + disks/pc/windows/3.00/README.md | 2 + modules/diskdump/lib/diskdump.js | 49 ++++++++++++------- modules/shared/lib/weblib.js | 2 +- pubs/pc/reference/ibm/5170/techref/README.md | 12 +++++ 19 files changed, 124 insertions(+), 30 deletions(-) create mode 100644 disks/pc/tools/microsoft/os2/sdk/README.md create mode 100644 disks/pc/tools/microsoft/windows/README.md create mode 100644 disks/pc/tools/microsoft/windows/sdk/README.md create mode 100644 pubs/pc/reference/ibm/5170/techref/README.md diff --git a/README.md b/README.md index d139df339..575def75e 100644 --- a/README.md +++ b/README.md @@ -349,12 +349,15 @@ where PCjs could run amok and destroy the planet. Other parameters that can be passed via the URL: - *autostart*: set it to "true" to allow all machines to start normally, "false" to prevent all machines from starting, -or "no" to prevent all machines from starting *unless* they have no "Run" button. - -For example: +or "no" to prevent all machines from starting *unless* they have no "Run" button; e.g.: http://localhost:8088/?gort=debug&autostart=false +- *aspect*: set it to a numeric value >= 0.3 and <= 3.33 to modify the default aspect ratio of a machine's screen on the +specified page; e.g.: + + http://localhost:8088/?aspect=2.0 + Updating PCjs --- diff --git a/devices/pc/machine/5160/ega/256kb/machine.md b/devices/pc/machine/5160/ega/256kb/machine.md index 78e1b8adf..84121a655 100644 --- a/devices/pc/machine/5160/ega/256kb/machine.md +++ b/devices/pc/machine/5160/ega/256kb/machine.md @@ -2,6 +2,8 @@ layout: page title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with EGA Display" permalink: /devices/pc/machine/5160/ega/256kb/ +redirect_from: + - /configs/pc/machines/5160/ega/256kb/ machines: - type: pc id: ibm5160 diff --git a/devices/pc/machine/5160/ega/640kb/machine.md b/devices/pc/machine/5160/ega/640kb/machine.md index 43d2b3c01..d7d6a3ee6 100644 --- a/devices/pc/machine/5160/ega/640kb/machine.md +++ b/devices/pc/machine/5160/ega/640kb/machine.md @@ -2,6 +2,8 @@ layout: page title: "IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with EGA Display" permalink: /devices/pc/machine/5160/ega/640kb/ +redirect_from: + - /configs/pc/machines/5160/ega/640kb/ machines: - type: pc id: ibm5160 diff --git a/devices/pc/machine/5160/mda/README.md b/devices/pc/machine/5160/mda/README.md index bb9d20768..aa739c4bc 100644 --- a/devices/pc/machine/5160/mda/README.md +++ b/devices/pc/machine/5160/mda/README.md @@ -2,6 +2,8 @@ layout: page title: IBM PC Machines (Model 5160) with Monochrome (MDA) Display permalink: /devices/pc/machine/5160/mda/ +redirect_from: + - /configs/pc/machines/5160/mda/ --- IBM PC XT with Monochrome (MDA) Display diff --git a/devices/pc/machine/5170/ega/1152kb/rev1/machine.md b/devices/pc/machine/5170/ega/1152kb/rev1/machine.md index 315a42eb9..1092a629c 100644 --- a/devices/pc/machine/5170/ega/1152kb/rev1/machine.md +++ b/devices/pc/machine/5170/ega/1152kb/rev1/machine.md @@ -2,6 +2,8 @@ layout: page title: "IBM PC AT (Model 5170, 1152Kb) with EGA Display and 20Mb Hard Disk" permalink: /devices/pc/machine/5170/ega/1152kb/rev1/ +redirect_from: + - /configs/pc/machines/5170/ega/1152kb/rev1/ machines: - type: pc id: ibm5170 diff --git a/devices/pc/machine/5170/ega/640kb/rev1/machine.md b/devices/pc/machine/5170/ega/640kb/rev1/machine.md index 347911c8f..98727f986 100644 --- a/devices/pc/machine/5170/ega/640kb/rev1/machine.md +++ b/devices/pc/machine/5170/ega/640kb/rev1/machine.md @@ -2,6 +2,9 @@ layout: page title: "IBM PC AT (Model 5170, 640Kb) with EGA Display" permalink: /devices/pc/machine/5170/ega/640kb/rev1/ +redirect_from: + - /configs/pc/machines/5170/ega/640kb/ + - /configs/pc/machines/5170/ega/640kb/rev1/ machines: - type: pc id: ibm5170 diff --git a/devices/pc/machine/5170/ega/README.md b/devices/pc/machine/5170/ega/README.md index c00d94cde..380ed664b 100644 --- a/devices/pc/machine/5170/ega/README.md +++ b/devices/pc/machine/5170/ega/README.md @@ -2,6 +2,8 @@ layout: page title: "IBM PC AT (Model 5170) with Enhanced Color Display" permalink: /devices/pc/machine/5170/ega/ +redirect_from: + - /configs/pc/machines/5170/ega/ --- IBM PC AT with Enhanced Color Graphics (EGA) Display diff --git a/devices/pc/rom/5170/README.md b/devices/pc/rom/5170/README.md index 5642d0ce1..dc856ba6b 100644 --- a/devices/pc/rom/5170/README.md +++ b/devices/pc/rom/5170/README.md @@ -5,6 +5,7 @@ permalink: /devices/pc/rom/5170/ redirect_from: - /devices/pc/5170/ - /devices/pc/bios/5170/ + - /devices/pc/rom/5170/bios/ --- IBM PC AT (Model 5170) BIOS diff --git a/devices/pc/rom/compaq/README.md b/devices/pc/rom/compaq/README.md index fc92cda13..33aee5bbc 100644 --- a/devices/pc/rom/compaq/README.md +++ b/devices/pc/rom/compaq/README.md @@ -3,6 +3,8 @@ layout: post title: COMPAQ BIOS ROMs date: 2016-02-24 14:00:00 permalink: /devices/pc/rom/compaq/ +redirect_from: + - /devices/pc/rom/compaq/bios/ --- COMPAQ BIOS ROMs diff --git a/devices/pc/rom/compaq/deskpro386/README.md b/devices/pc/rom/compaq/deskpro386/README.md index 0ca96fd46..eceedadec 100644 --- a/devices/pc/rom/compaq/deskpro386/README.md +++ b/devices/pc/rom/compaq/deskpro386/README.md @@ -4,6 +4,7 @@ title: COMPAQ DeskPro 386 ROMs permalink: /devices/pc/rom/compaq/deskpro386/ redirect_from: - /devices/pc/compaq/deskpro386/ + - /devices/pc/rom/compaq/bios/deskpro386/ --- COMPAQ DeskPro 386 ROMs diff --git a/disks/pc/tools/microsoft/README.md b/disks/pc/tools/microsoft/README.md index 5f32f8ac0..bdd2db7cc 100644 --- a/disks/pc/tools/microsoft/README.md +++ b/disks/pc/tools/microsoft/README.md @@ -4,7 +4,7 @@ title: Microsoft Languages and Tools permalink: /disks/pc/tools/microsoft/ --- -Microsoft Languages and Tools +Microsoft Languages --- * Microsoft BASIC @@ -22,12 +22,15 @@ Microsoft Languages and Tools * [Microsoft Macro Assembler 6.00](/disks/pc/tools/microsoft/masm/6.00/) * [Microsoft Macro Assembler 6.11](/disks/pc/tools/microsoft/masm/6.11/) * [Microsoft Mouse 5.00](/disks/pc/tools/microsoft/mouse/5.00/) -* [Microsoft OS/2 SDK 1.02](/disks/pc/tools/microsoft/os2/sdk/1.02/) -* [Microsoft Windows SDK 1.01](/disks/pc/tools/microsoft/windows/sdk/1.01/) -* [Microsoft Windows SDK 1.03](/disks/pc/tools/microsoft/windows/sdk/1.03/) -* [Microsoft Windows SDK 1.04](/disks/pc/tools/microsoft/windows/sdk/1.04/) -* Microsoft Windows SDK 2.03 -* Microsoft Windows SDK 3.00 + +Microsoft SDKs +--- + +* [Microsoft OS/2 SDKs](/disks/pc/tools/microsoft/os2/sdk/) +* [Microsoft Windows SDKs](/disks/pc/tools/microsoft/windows/sdk/) + +Microsoft Languages Newsletters +--- Below are all the "Microsoft Languages NewsLetters" that Microsoft published in [PC Tech Journal](/pubs/pc/magazines/pctj/), before they decided to focus exclusively diff --git a/disks/pc/tools/microsoft/os2/sdk/README.md b/disks/pc/tools/microsoft/os2/sdk/README.md new file mode 100644 index 000000000..d015946d4 --- /dev/null +++ b/disks/pc/tools/microsoft/os2/sdk/README.md @@ -0,0 +1,11 @@ +--- +layout: page +title: Microsoft OS/2 SDKs +permalink: /disks/pc/tools/microsoft/os2/sdk/ +--- + +Microsoft OS/2 SDKs +--- + +* [Microsoft OS/2 SDK 1.02](/disks/pc/tools/microsoft/os2/sdk/1.02/) + diff --git a/disks/pc/tools/microsoft/windows/README.md b/disks/pc/tools/microsoft/windows/README.md new file mode 100644 index 000000000..f37ada2b7 --- /dev/null +++ b/disks/pc/tools/microsoft/windows/README.md @@ -0,0 +1,19 @@ +--- +layout: page +title: Microsoft Windows DDKs and SDKs +permalink: /disks/pc/tools/microsoft/windows/ +--- + +Microsoft Windows DDKs +--- + +* Microsoft Windows DDK 3.10 + +Microsoft Windows SDKs +--- + +* [Microsoft Windows SDK 1.01](/disks/pc/tools/microsoft/windows/sdk/1.01/) +* [Microsoft Windows SDK 1.03](/disks/pc/tools/microsoft/windows/sdk/1.03/) +* [Microsoft Windows SDK 1.04](/disks/pc/tools/microsoft/windows/sdk/1.04/) +* Microsoft Windows SDK 2.03 +* Microsoft Windows SDK 3.00 diff --git a/disks/pc/tools/microsoft/windows/sdk/README.md b/disks/pc/tools/microsoft/windows/sdk/README.md new file mode 100644 index 000000000..85f90c26a --- /dev/null +++ b/disks/pc/tools/microsoft/windows/sdk/README.md @@ -0,0 +1,14 @@ +--- +layout: page +title: Microsoft Windows SDKs +permalink: /disks/pc/tools/microsoft/windows/sdks/ +--- + +Microsoft Windows SDKs +--- + +* [Microsoft Windows SDK 1.01](/disks/pc/tools/microsoft/windows/sdk/1.01/) +* [Microsoft Windows SDK 1.03](/disks/pc/tools/microsoft/windows/sdk/1.03/) +* [Microsoft Windows SDK 1.04](/disks/pc/tools/microsoft/windows/sdk/1.04/) +* Microsoft Windows SDK 2.03 +* Microsoft Windows SDK 3.00 diff --git a/disks/pc/windows/2.03/README.md b/disks/pc/windows/2.03/README.md index 5b2487664..bb3c9fcce 100644 --- a/disks/pc/windows/2.03/README.md +++ b/disks/pc/windows/2.03/README.md @@ -2,6 +2,8 @@ layout: page title: Microsoft Windows 2.03 permalink: /disks/pc/windows/2.03/ +redirect_from: + - /disks/pc/win/win203/ --- Microsoft Windows 2.03 diff --git a/disks/pc/windows/3.00/README.md b/disks/pc/windows/3.00/README.md index e8f77b17c..603b2d52c 100644 --- a/disks/pc/windows/3.00/README.md +++ b/disks/pc/windows/3.00/README.md @@ -2,6 +2,8 @@ layout: page title: Microsoft Windows 3.00 permalink: /disks/pc/windows/3.00/ +redirect_from: + - /devices/pc/machine/5170/ega/1152kb/win300/ machines: - type: pc id: ibm5170-win300 diff --git a/modules/diskdump/lib/diskdump.js b/modules/diskdump/lib/diskdump.js index 54398f354..7ff484f8f 100644 --- a/modules/diskdump/lib/diskdump.js +++ b/modules/diskdump/lib/diskdump.js @@ -688,28 +688,39 @@ DiskDump.API = function(aParms) var sFormat = aParms[DumpAPI.QUERY.FORMAT] || DumpAPI.FORMAT.JSON; var fComments = (aParms[DumpAPI.QUERY.COMMENTS]? true : false); - var disk = new DiskDump(sDisk, null, sFormat, fComments); - - disk.loadFile(function(err) { - if (!err) { - var sData, sType, fBase64; - if (sFormat == DumpAPI.FORMAT.IMG) { - sType = "octet-stream"; - var buf = disk.convertToIMG(); - if (buf) { - sData = disk.encodeAsBase64(buf); - fBase64 = true; + if (sDisk) { + var disk = new DiskDump(sDisk, null, sFormat, fComments); + disk.loadFile(function(err) { + if (!err) { + var sData, sType, fBase64; + if (sFormat == DumpAPI.FORMAT.IMG) { + sType = "octet-stream"; + var buf = disk.convertToIMG(); + if (buf) { + sData = disk.encodeAsBase64(buf); + fBase64 = true; + } + } else { + sType = "json"; + sData = disk.convertToJSON(); + } + if (sData) { + var sFileName = str.getBaseName(disk.sDiskPath, true) + '.' + sFormat; + var sAlert = web.downloadFile(sData, sType, fBase64, sFileName); + web.alertUser(sAlert); + } else { + web.alertUser("No data."); } } else { - sType = "json"; - sData = disk.convertToJSON(); + web.alertUser(err.message); } - if (sData) { - var sAlert = web.downloadFile(sData, sType, fBase64); - web.alertUser(sAlert); - } - } - }); + }); + } else { + /* + * The client-side API currently supports DumpAPI.QUERY.DISK requests only (eg, not DumpAPI.QUERY.FILE). + */ + web.alertUser("Unsupported API request."); + } }; /** diff --git a/modules/shared/lib/weblib.js b/modules/shared/lib/weblib.js index 168b61af4..9a74e1792 100644 --- a/modules/shared/lib/weblib.js +++ b/modules/shared/lib/weblib.js @@ -644,7 +644,7 @@ web.downloadFile = function(sData, sType, fBase64, sFileName) sAlert = 'Check your Downloads folder for ' + sFileName + '.'; } else { window.open(sURI); - sAlert = 'Check your browser for a new window/tab containing the requested data (' + sFileName + ').'; + sAlert = 'Check your browser for a new window/tab containing the requested data' + (sFileName? (' (' + sFileName + ')') : '') + '.'; } return sAlert; }; diff --git a/pubs/pc/reference/ibm/5170/techref/README.md b/pubs/pc/reference/ibm/5170/techref/README.md new file mode 100644 index 000000000..e84a2a813 --- /dev/null +++ b/pubs/pc/reference/ibm/5170/techref/README.md @@ -0,0 +1,12 @@ +--- +layout: page +title: IBM 5170 Technical Reference +permalink: /pubs/pc/reference/ibm/5170/techref/ +--- + +IBM 5170 Technical Reference +--- + +* [IBM 5170 Technical Reference, March 1984](/pubs/pc/reference/ibm/5170/techref/1984-03/) +* [IBM 5170 Technical Reference, September 1985](/pubs/pc/reference/ibm/5170/techref/1985-09/) +* [IBM 5170 Technical Reference, March 1986](/pubs/pc/reference/ibm/5170/techref/1986-03/)