Commit 37aa7450 authored by Dave Cooper's avatar Dave Cooper
Browse files

ready to merge back with devo

parent 4d990dc6
......@@ -4,7 +4,7 @@
"The Gendl\" (legacy) Testing and Tracking Utility, version 2 (using Ajax but pre-gdlAjax, and no JQuery or CSS)"
:author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20141120" :depends-on (:gwl-graphics)
:version "20141215" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -4,7 +4,7 @@
"The Gendl\" Web-based Development Environment (tasty)" :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20141120" :depends-on (:tree :gwl-graphics)
:version "20141215" :depends-on (:tree :gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -4,7 +4,7 @@
"The Gendl\" Translators to/from XML and potentially other high-level KBE and Knowledge formats"
:author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20141120" :depends-on (:gwl)
:version "20141215" :depends-on (:gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -4,7 +4,7 @@
"The Gendl\" Tree component used by Tasty and potentially as a UI component on its own"
:author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20141120" :depends-on (:gwl-graphics)
:version "20141215" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -4,7 +4,7 @@
"The Gendl\" Yet Another Definition Documenter (yadd)" :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20141120" :depends-on
:version "20141215" :depends-on
(:gwl-graphics #-allegro :cl-html-parse)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:base :description
"The Gendl\" Base Core Kernel Engine" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20141120" :depends-on nil
:serial t :version "20141215" :depends-on nil
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -30,7 +30,7 @@
;;(defparameter *gendl-version* "1587p007")
;;(defparameter *gendl-version* "1587p008")
;;(defparameter *gendl-version* "1587p009")
(defparameter *gendl-version* "1587p010-dev")
(defparameter *gendl-version* "1587p010")
;;(defparameter *gendl-version* "ql-2013-12")
(defparameter *gendl-patch-level* nil)
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:cl-lite :description
"The Gendl\" Compile-and-Load Lite Utility" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20141120" :depends-on (:glisp)
:serial t :version "20141215" :depends-on (:glisp)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:bus :description
"The Gendl\" Wireframe School Bus Demo" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20141120" :depends-on (:gwl-graphics)
:serial t :version "20141215" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:ledger :description
"The Gendl\" Ledger Bookkeeping Demo" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20141120" :depends-on
:serial t :version "20141215" :depends-on
(#-gwl :gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
......@@ -4,7 +4,7 @@
"The Gendl\" Simplified Android Robot example " :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20141120" :depends-on (:gwl-graphics)
:version "20141215" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -4,7 +4,7 @@
"The Gendl\" Wire-World demo and test-case for wireframe tessellation and X3D output"
:author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20141120" :depends-on
:version "20141215" :depends-on
(#-gwl-graphics :gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:examples :description
"The Gendl\" examples Subsystem" :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20141120" :depends-on (:gwl-graphics :surf)
:version "20141215" :depends-on (:gwl-graphics :surf)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -60,9 +60,13 @@
(
(remote-utils :type 'remote-object
:remote-type 'remote-utils
:sequence (:size (the remote-drilled number-of-elements))
:host (the (remote-drilled (the-child index)) host)
:port (the (remote-drilled (the-child index)) port))
;;:sequence (:size (the remote-drilled number-of-elements))
;;:host (the (remote-drilled (the-child index)) host)
;;:port (the (remote-drilled (the-child index)) port)
:slot-a "a"
:host "seven"
:port "9000"
)
(local-drilled :type 'drilled-block
:sequence (:size (the quantity))
......@@ -95,6 +99,11 @@
(define-object remote-utils ()
:input-slots (slot-a)
:computed-slots ((slot-b (string-append (the slot-a) " and b")))
:functions
((clear-remotes
()
......@@ -102,6 +111,8 @@
(global-gc
()
(format t "Hey now!~%")
(glisp:gc-full))))
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:geom-base :description
"The Gendl\" Wireframe Geometry" :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20141120" :depends-on (:glisp)
:version "20141215" :depends-on (:glisp)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:glisp :description
"The Gendl\" Common Lisp Portability" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20141120" :depends-on
:serial t :version "20141215" :depends-on
(:base :uiop :cl-typesetting :cl-ppcre :cl-who #-allegro :cl-base64 #-allegro :babel #-allegro :acl-compat)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:gwl-graphics :description
"The Gendl\" GWL embedded graphics support" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20141120" :depends-on (:geom-base :gwl)
:serial t :version "20141215" :depends-on (:geom-base :gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:gwl :description
"The Gendl\" Generative Web Language (GWL)" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20141120" :depends-on
:serial t :version "20141215" :depends-on
(:bordeaux-threads :glisp :aserve)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
......@@ -77,3 +77,24 @@
#+allegro
(defun string-to-compressed-base64-string (string)
(excl:usb8-array-to-base64-string
(let* ((vector (make-array 5 :element-type '(unsigned-byte 8)))
(deflate-stream (make-instance 'util.zip:deflate-stream :target vector)))
(write-string string deflate-stream)
(close deflate-stream)
(util.zip:deflate-stream-vector-combined deflate-stream))))
#+allegro
(defun compressed-base64-string-to-string (string)
(let ((array (excl:base64-string-to-usb8-array string)))
(excl:with-input-from-buffer (in array)
(util.zip:skip-gzip-header in)
(let ((inflate-stream (make-instance 'util.zip:inflate-stream :input-handle in))
(result nil) (newline (format nil "~%")))
(do ((line (read-line inflate-stream nil nil) (read-line inflate-stream nil nil)))
((null line) result)
(setq result (if result (string-append result newline line) line)))))))
......@@ -43,10 +43,14 @@
(publish :path "/fetch-remote-input"
:function
#'(lambda(req ent)
(bt:with-lock-held (*remote-fetch-input-lock*)
(progn ;; bt:with-lock-held (*remote-fetch-input-lock*)
(let* ((query (request-query req))
(args (rest (assoc "args" query :test #'string-equal)))
(*ipaddr* (socket:ipaddr-to-dotted (socket:remote-host (request-socket req)))))
(print-variables query args *ipaddr*)
(let ((args-list (base64-decode-list args)))
;;
;; FLAG -- consider a warning if package not found
......@@ -131,7 +135,7 @@
(with-http-response (req ent)
(with-http-body (req ent)
(let ((value (if object (multiple-value-bind (value error)
(bt:with-lock-held (*remote-evaluate-lock*)
(progn ;; bt:with-lock-held (*remote-evaluate-lock*)
(ignore-errors (if args
(the-object object ((evaluate message)
(:apply args)))
......@@ -186,7 +190,7 @@
(publish :path "/make-remote-object"
:function
#'(lambda(req ent)
(bt:with-lock-held (*remote-hash-lock*)
(progn ;; bt:with-lock-held (*remote-hash-lock*)
(let* ((query (request-query req))
(ipaddr (socket:ipaddr-to-dotted (socket:remote-host (request-socket req))))
(*ipaddr* (socket:ipaddr-to-dotted (socket:remote-host (request-socket req))))
......@@ -234,7 +238,7 @@
(defmethod evaluate-object ((category (eql :remote-gdl-instance)) args)
(let ((hash-key (list (getf args :id) (getf args :root-path))))
(bt:with-lock-held (*remote-proxy-lock*)
(progn ;; bt:with-lock-held (*remote-proxy-lock*)
(or (gethash hash-key gwl::*remote-proxies-hash* )
(progn
(format t "~%~%~s Not found in hash - creating fresh ~%~%" (getf args :id))
......
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