Commit 758d69c6 authored by Dave Cooper's avatar Dave Cooper
Browse files

fixed geysr bug, merged patches.

parent 91186569
......@@ -96,6 +96,9 @@
#'check-for-open-socket-before-gc))
; track all the ipaddrs by which we're reachable
;;
;; Have to fix IPv6 before the below will work.
;;
#+nil
(if* (not (member (setq localhost (socket:local-host sock))
ipaddrs))
......
......@@ -63,17 +63,6 @@ It came in as ~s instead.~%"
((null (the asdf-defsystem-depends-on)) nil)
(t (the asdf-defsystem-depends-on)))
#|
:depends-on ,(the asdf-depends-on)
,(format nil "%%remove%%#-asdf-unicode :defsystem-depends-on #-asdf-unicode ~a%%remove%%"
(format nil "(:asdf-encodings~a~a)"
(if (the asdf-defsystem-depends-on) " " "")
(or (the asdf-defsystem-depends-on) "")))
,(format nil "%%remove%%#+asdf-unicode :defsystem-depends-on #+asdf-unicode ~a%%remove%%"
(format nil "(~a)" (or (the asdf-defsystem-depends-on) "")))
"%%remove%%#+asdf-encodings :encoding #+asdf-encodings :utf-8%%remove%%"
|#
;;
;; FLAG -- maybe can get rid of binaries and need to call (the compile-and-load)
;;
......@@ -94,12 +83,7 @@ It came in as ~s instead.~%"
(list (if (string-equal (pathname-type source) "lisp")
:file
(make-keyword (pathname-type source)))
namestring)
#+nil
(list :file namestring
:pathname
(merge-pathnames namestring "")))))
namestring))))
binaries (the source-file-list)))))
:uncached)))
......@@ -401,7 +401,9 @@ This function will be run in the initiating image after the build is finished."
(if (eql ,val-arg 'gdl-rule:%not-handled%) (not-handled ,self-arg ,(make-keyword attr-sym) ,args-arg) ,val-arg)))))))))))
computed-slots)))
;;
;; Merged into devo 2020-12-17
;;
(define-object-amendment vanilla-mixin ()
:functions
((toggle-slot! (slot) (the (set-slot! slot (not (the (evaluate slot))))))))
......@@ -219,8 +219,7 @@
(if error (the-object respondent (sanity-error error))))))))))))))))
;;
;; FLAG -- Then Tweaked.
;;
;; Merged into devo 2020-08-17.
;;
(#+allegro
......@@ -228,7 +227,6 @@
(#+allegro
excl:without-redefinition-warnings #-allegro progn
(defun start-session-reaper (&key (minutes 20) (debug? t) (listeners 20) extra-functions restart-server?)
;;(declare (ignore listeners))
(format t "~2%Lauching Expired Session Reaper to awaken and run every ~a minute~:p~2%" minutes)
(glisp:process-run-function
"GWL Session Reaper"
......@@ -260,30 +258,6 @@
:input-slots ((instance-id nil :defaulting :settable)))))
#+nil
;;
;; FLAG -- we think the one in codbase in ajax.lisp is more complete than this.
;;
(defun restore-from-snap (iid object)
(let ((snap-file
(merge-pathnames
(make-pathname :name (format nil "~a" iid)
:type "snap") (glisp:snap-folder))))
(unless (probe-file snap-file) (error "~a not found~%" snap-file))
(read-snapshot :filename snap-file
:object object
:keys-to-ignore (list :time-last-touched
:time-instantiated
:expires-at))
(theo object (set-slot! :instance-id iid))
(setf (gethash (make-keyword-sensitive (the-object object instance-id))
*instance-hash-table*)
(list object nil))))
;;
;; Merged into devo 2020-08-18
......@@ -340,19 +314,6 @@ package-qualified object name\")
(with-http-body (req ent)))))))
;;
;; FLAG -- is this used anywhere?
;;
#+nil
(defun register-instance (instance)
(let ((iid (theo instance instance-id)))
(let ((current (first (gethash iid gwl::*instance-hash-table*))))
(cond ((and current (not (eql current instance)))
(error "Instances don't match for ~a.~%" iid))
(current iid)
(t (setf (gethash iid gwl:*instance-hash-table*) (list instance))
iid)))))
#+nil
(defmacro wmd (string)
`(str
......@@ -364,7 +325,7 @@ package-qualified object name\")
(export 'wmd :gwl))
;;
;; FLAG -- Tweaked.
;; Merged into devo 2020-12-17
;;
(#+allegro
excl:without-package-locks
......@@ -379,6 +340,9 @@ package-qualified object name\")
;;
;; Merged into devo 2020-12-17
;;
(#+allegro
excl:without-package-locks
#-allegro
......@@ -392,7 +356,9 @@ ignored. If this is specified as nil, then (the preset?) of individual
form-controls (default of these is also nil) will be respected. Default is nil."
preset-all? nil))))
;;
;; Merged into devo 2020-12-17
;;
(#+allegro
excl:without-package-locks
#-allegro
......@@ -417,6 +383,10 @@ form-controls (default of these is also nil) will be respected. Default is nil."
(in-package :svg)
;;
;; Merged into devo 2020-12-17
;;
(#+allegro
excl:without-package-locks
#-allegro
......@@ -460,6 +430,10 @@ form-controls (default of these is also nil) will be respected. Default is nil."
(in-package :gwl)
;;
;; Merged into devo 2020-12-17
;;
(#+allegro
excl:without-package-locks
#-allegro
......@@ -485,7 +459,11 @@ x3draw();
" (the view-selector value)))
(:svg
""
"
if (document.getElementById('svg-1'))
{
panZoomSVG1 = svgPanZoom('#svg-1', {
zoomEnabled: true,
controlIconsEnabled: true,
......@@ -493,7 +471,8 @@ x3draw();
fit: true,
minZoom: 0.01,
maxZoom: 100,
center: true});")))
center: true});
};")))
(viewport-script
(progn
......@@ -503,6 +482,4 @@ x3draw();
(:div
((:script :type "text/javascript")
(str (the viewport-js-text))))))
(t ""))))
)))
(t "")))))))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment