fix Panorama databases; Joerg Jenderek

diff --git a/magic/Magdir/archive b/magic/Magdir/archive
index 9a4809f4dcb7240388567ac1fef7c66b71882bea..e3d0b255fbd05bc67cddbd3c5567d2a23f358760 100644 (file)
--- a/magic/Magdir/archive
+++ b/magic/Magdir/archive
@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# $File: archive,v 1.100 2015/12/15 01:06:00 christos Exp $
+# $File: archive,v 1.101 2016/01/08 00:41:02 christos Exp $
 # archive:  file(1) magic for archive formats (see also "msdos" for self-
 #           extracting compressed archives)
 #
@@ -246,7 +246,15 @@
 # BA
 # TODO: idarc says "bytes 0-2 == bytes 3-5"
 # TTComp
-0      string  \0\6 TTComp archive data
+# URL: http://fileformats.archiveteam.org/wiki/TTComp_archive
+# Update: Joerg Jenderek
+# GRR: line below is too general as it matches also Panorama database "TCDB 2003-10 demo.pan", others
+0      string  \0\6 
+# look for first keyword of Panorama database *.pan
+>12    search/261      DESIGN  
+# skip keyword with low entropy
+>12    default         x       TTComp archive, binary, 4K dictionary
+# (version 5.25) labeled the above entry as "TTComp archive data"
 # ESP, could this conflict with Easy Software Products' (e.g.ESP ghostscript) documentation?
 0      string  ESP ESP archive data
 # ZPack

diff --git a/magic/Magdir/database b/magic/Magdir/database
index f89b0f398c96e59631710bec819dd99c9c16b132..8f8b448972402d0f7ef906fe06d12668b1503a34 100644 (file)
--- a/magic/Magdir/database
+++ b/magic/Magdir/database
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: database,v 1.46 2015/09/27 05:40:08 christos Exp $
+# $File: database,v 1.47 2016/01/08 00:41:02 christos Exp $
 # database:  file(1) magic for various databases
 #
 # extracted from header/code files by Graeme Wilford (eep2gw@ee.surrey.ac.uk)
@@ -550,3 +550,18 @@
 # Hopper (reverse engineering tool) http://www.hopperapp.com/
 0      string          hopperdb        Hopper database
 
+# URL: https://en.wikipedia.org/wiki/Panorama_(database_engine)
+# Reference: http://www.provue.com/Panorama/
+# From: Joerg Jenderek
+# NOTE: test only versions 4 and 6.0 with Windows
+# length of Panorama database name 
+5      ubyte                           >0              
+# look after database name for "some" null bits
+>(5.B+7)       ubelong&0xF3ffF000      0               
+# look for first keyword
+>>&1           search/2                DESIGN          Panorama database
+#!:mime        application/x-panorama-database
+!:apple        KASXZEPD
+!:ext  pan
+# database name
+>>>5   pstring                         x               \b, "%s"

diff --git a/magic/Magdir/psdbms b/magic/Magdir/psdbms
index 09c733fddf756625d818c72beca6be1ce443e5db..1d218c0b85484b8b0fb6c0b0f2d2835ecebeb2eb 100644 (file)
--- a/magic/Magdir/psdbms
+++ b/magic/Magdir/psdbms
@@ -1,8 +1,14 @@
 
 #------------------------------------------------------------------------------
-# $File: psdbms,v 1.6 2009/09/19 16:28:11 christos Exp $
+# $File: psdbms,v 1.7 2016/01/08 00:41:02 christos Exp $
 # psdbms:  file(1) magic for psdatabase
 #
-0      belong&0xff00ffff       0x56000000      ps database
->1     string  >\0     version %s
->4     string  >\0     from kernel %s
+# Update: Joerg Jenderek
+# GRR: line below too general as it catches also some Panorama database *.pan ,
+# AppleWorks word processor
+0      belong&0xff00ffff       0x56000000      
+# assume version starts with digit
+>1     regex/s                 =^[0-9]         ps database
+>>1    string  >\0     version %s
+# kernel name
+>>4    string  >\0     from kernel %s